From 79e0a2a5d751c7c077e52f9ee54469656dc96a44 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Dec 2019 10:53:29 +0100
Subject: [PATCH] Rename A2 framework package.

---
 .../org/argeo/osgi/{boot => }/a2/ClasspathSourceTest.java     | 4 +++-
 .../src/org/argeo/osgi/{boot => }/a2/A2Branch.java            | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/A2Component.java         | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/A2Contribution.java      | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/A2Exception.java         | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/A2Module.java            | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/A2Source.java            | 2 +-
 .../argeo/osgi/{boot => }/a2/AbstractProvisioningSource.java  | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/ClasspathSource.java     | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/FsA2Source.java          | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/FsM2Source.java          | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/OsgiContext.java         | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/ProvisioningManager.java | 2 +-
 .../src/org/argeo/osgi/{boot => }/a2/ProvisioningSource.java  | 2 +-
 org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java     | 4 ++--
 15 files changed, 18 insertions(+), 16 deletions(-)
 rename org.argeo.osgi.boot/ext/test/org/argeo/osgi/{boot => }/a2/ClasspathSourceTest.java (88%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Branch.java (98%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Component.java (98%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Contribution.java (98%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Exception.java (90%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Module.java (97%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/A2Source.java (86%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/AbstractProvisioningSource.java (99%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/ClasspathSource.java (97%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/FsA2Source.java (98%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/FsM2Source.java (98%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/OsgiContext.java (97%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/ProvisioningManager.java (99%)
 rename org.argeo.osgi.boot/src/org/argeo/osgi/{boot => }/a2/ProvisioningSource.java (95%)

diff --git a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/a2/ClasspathSourceTest.java b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/a2/ClasspathSourceTest.java
similarity index 88%
rename from org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/a2/ClasspathSourceTest.java
rename to org.argeo.osgi.boot/ext/test/org/argeo/osgi/a2/ClasspathSourceTest.java
index 6f4b46733..d087e5a3f 100644
--- a/org.argeo.osgi.boot/ext/test/org/argeo/osgi/boot/a2/ClasspathSourceTest.java
+++ b/org.argeo.osgi.boot/ext/test/org/argeo/osgi/a2/ClasspathSourceTest.java
@@ -1,7 +1,9 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.IOException;
 
+import org.argeo.osgi.a2.ClasspathSource;
+import org.argeo.osgi.a2.ProvisioningManager;
 import org.argeo.osgi.boot.equinox.EquinoxUtils;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Branch.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Branch.java
similarity index 98%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Branch.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Branch.java
index 9e3f81dec..070830e57 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Branch.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Branch.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.util.Collections;
 import java.util.SortedMap;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Component.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Component.java
similarity index 98%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Component.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Component.java
index a2d5facf9..0b5d13cce 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Component.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Component.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.util.Collections;
 import java.util.SortedMap;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Contribution.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Contribution.java
similarity index 98%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Contribution.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Contribution.java
index e81ecadc8..35d5f9b03 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Contribution.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Contribution.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.util.Collections;
 import java.util.Map;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Exception.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Exception.java
similarity index 90%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Exception.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Exception.java
index 129d38fbf..83c743afe 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Exception.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Exception.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 /** Unchecked A2 provisioning exception. */
 public class A2Exception extends RuntimeException {
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Module.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Module.java
similarity index 97%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Module.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Module.java
index 44f94e334..77f81d130 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Module.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Module.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import org.osgi.framework.Version;
 
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Source.java
similarity index 86%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Source.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Source.java
index eb23845e2..2c88a385f 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/A2Source.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/A2Source.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 /** A provisioning source in A2 format. */
 public interface A2Source extends ProvisioningSource {
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/AbstractProvisioningSource.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/AbstractProvisioningSource.java
similarity index 99%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/AbstractProvisioningSource.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/AbstractProvisioningSource.java
index c8497d0b0..32c175d3a 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/AbstractProvisioningSource.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/AbstractProvisioningSource.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ClasspathSource.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ClasspathSource.java
similarity index 97%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ClasspathSource.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/ClasspathSource.java
index 330f66a99..ea346663d 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ClasspathSource.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ClasspathSource.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsA2Source.java
similarity index 98%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsA2Source.java
index bea8db3ea..eea59ded6 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsA2Source.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsM2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsM2Source.java
similarity index 98%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsM2Source.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsM2Source.java
index 881452279..a4c3ed5df 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsM2Source.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/FsM2Source.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/OsgiContext.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/OsgiContext.java
similarity index 97%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/OsgiContext.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/OsgiContext.java
index b4f101887..8630dc26d 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/OsgiContext.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/OsgiContext.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import org.argeo.osgi.boot.OsgiBootUtils;
 import org.osgi.framework.Bundle;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningManager.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningManager.java
similarity index 99%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningManager.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningManager.java
index c88af39d9..dd7fa3b0e 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningManager.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningManager.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import java.io.File;
 import java.net.URI;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningSource.java b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningSource.java
similarity index 95%
rename from org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningSource.java
rename to org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningSource.java
index 62d7042d6..7d6fadf7b 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/ProvisioningSource.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/a2/ProvisioningSource.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.boot.a2;
+package org.argeo.osgi.a2;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
index 6824ecaf5..38da0479f 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
@@ -32,8 +32,8 @@ import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
-import org.argeo.osgi.boot.a2.A2Source;
-import org.argeo.osgi.boot.a2.ProvisioningManager;
+import org.argeo.osgi.a2.A2Source;
+import org.argeo.osgi.a2.ProvisioningManager;
 import org.argeo.osgi.boot.internal.springutil.AntPathMatcher;
 import org.argeo.osgi.boot.internal.springutil.PathMatcher;
 import org.argeo.osgi.boot.internal.springutil.SystemPropertyUtils;
-- 
2.30.2