tidy up common packages to use common prefix (FELIX-2504)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@981577 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/common/core/sigil.properties b/sigil/common/core/sigil.properties
index e4c1858..086b1c3 100644
--- a/sigil/common/core/sigil.properties
+++ b/sigil/common/core/sigil.properties
@@ -1,11 +1,22 @@
# sigil project file, saved by plugin.
--activator: org.apache.felix.sigil.core.BldCore
+-activator: org.apache.felix.sigil.common.core.BldCore
-bundles: \
org.apache.felix.sigil.common.core, \
+-contents: \
+ aQute.bnd*, \
+ aQute.lib*, \
+ aQute.libg*, \
+ aQute.service.scripting*, \
+ org.apache.felix.sigil.common.bnd*, \
+ org.apache.felix.sigil.common.config*, \
+ org.apache.felix.sigil.common.core*, \
+ org.apache.felix.sigil.common.model*, \
+ org.apache.felix.sigil.common.repository*,
+
-resources: \
profiles, \
profiles/CDC-1.0_Foundation-1.0.profile, \
@@ -19,40 +30,29 @@
profiles/OSGi_Minimum-1.1.profile, \
profiles/profile.list, \
--contents: \
- aQute.bnd*, \
- aQute.lib*, \
- aQute.libg*, \
- aQute.service.scripting*, \
- org.apache.felix.sigil.bnd*, \
- org.apache.felix.sigil.config*, \
- org.apache.felix.sigil.core*, \
- org.apache.felix.sigil.model*, \
- org.apache.felix.sigil.repository*, \
-
-exports: \
- org.apache.felix.sigil.bnd, \
- org.apache.felix.sigil.config, \
- org.apache.felix.sigil.core, \
- org.apache.felix.sigil.core.licence, \
- org.apache.felix.sigil.core.repository, \
- org.apache.felix.sigil.model, \
- org.apache.felix.sigil.model.eclipse, \
- org.apache.felix.sigil.model.osgi, \
- org.apache.felix.sigil.repository, \
+ org.apache.felix.sigil.common.bnd, \
+ org.apache.felix.sigil.common.config, \
+ org.apache.felix.sigil.common.core, \
+ org.apache.felix.sigil.common.core.licence, \
+ org.apache.felix.sigil.common.core.repository, \
+ org.apache.felix.sigil.common.model, \
+ org.apache.felix.sigil.common.model.eclipse, \
+ org.apache.felix.sigil.common.model.osgi, \
+ org.apache.felix.sigil.common.repository, \
-imports: \
aQute.lib.osgi;resolve=compile, \
- org.apache.felix.sigil.bnd, \
+ org.apache.felix.sigil.common.bnd, \
+ org.apache.felix.sigil.common.config, \
+ org.apache.felix.sigil.common.core, \
+ org.apache.felix.sigil.common.core.licence, \
+ org.apache.felix.sigil.common.core.repository, \
+ org.apache.felix.sigil.common.model, \
+ org.apache.felix.sigil.common.model.eclipse, \
+ org.apache.felix.sigil.common.model.osgi, \
org.apache.felix.sigil.common.osgi, \
- org.apache.felix.sigil.config, \
- org.apache.felix.sigil.core, \
- org.apache.felix.sigil.core.licence, \
- org.apache.felix.sigil.core.repository, \
- org.apache.felix.sigil.model, \
- org.apache.felix.sigil.model.eclipse, \
- org.apache.felix.sigil.model.osgi, \
- org.apache.felix.sigil.repository, \
+ org.apache.felix.sigil.common.repository, \
org.eclipse.core.runtime, \
org.osgi.framework, \
diff --git a/sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java b/sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
index a99aedf..199c477 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/bnd/BundleBuilder.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/bnd/BundleBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.bnd;
+package org.apache.felix.sigil.common.bnd;
import java.io.File;
import java.io.FileOutputStream;
@@ -33,15 +33,15 @@
import java.util.Set;
import java.util.jar.Attributes;
+import org.apache.felix.sigil.common.config.BldAttr;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldAttr;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.repository.SystemRepositoryProvider;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
import aQute.lib.osgi.Builder;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
index 7e4f52b..76f8444 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldAttr.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldAttr.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
public class BldAttr
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
index 58066aa..f12dd4a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConfig.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.IOException;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@
import java.util.Properties;
import java.util.TreeMap;
-import org.apache.felix.sigil.core.util.QuoteUtil;
+import org.apache.felix.sigil.common.core.util.QuoteUtil;
public class BldConfig
{
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
index fe7f7b1..e375c3c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldConverter.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldConverter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.net.URI;
@@ -31,17 +31,17 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import aQute.lib.osgi.Constants;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
index dc98eec..80eb432 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldFactory.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.File;
import java.io.IOException;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
index 71a693e..7511258 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProject.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
@@ -41,22 +41,22 @@
import java.util.Properties;
import java.util.TreeSet;
+import org.apache.felix.sigil.common.config.internal.InlineResource;
+import org.apache.felix.sigil.common.config.internal.PreprocessedResource;
+import org.apache.felix.sigil.common.config.internal.StandardResource;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport.OSGiImport;
import org.apache.felix.sigil.common.osgi.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.config.internal.InlineResource;
-import org.apache.felix.sigil.config.internal.PreprocessedResource;
-import org.apache.felix.sigil.config.internal.StandardResource;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IPackageImport.OSGiImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
public class BldProject implements IBldProject, IRepositoryConfig
{
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
index 37400ef..1ff11e5 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldProperties.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldProperties.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.File;
import java.io.IOException;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
index cbb788d..f51c386 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/BldUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/BldUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.util.Properties;
import java.util.regex.Matcher;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
similarity index 92%
rename from sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
index 2c62954..d766fae 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/IBldProject.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/IBldProject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.File;
@@ -27,11 +27,11 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
public interface IBldProject
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
index 57567b6..266bce3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/IRepositoryConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/IRepositoryConfig.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.util.Map;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/Resource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/config/Resource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
index 0b36902..c0e8b9d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/Resource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/Resource.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.config;
+package org.apache.felix.sigil.common.config;
import java.io.File;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
index 3afaf35..21e2305 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/AbstractResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/AbstractResource.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
import java.io.File;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.Resource;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.Resource;
/**
* @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
index a8673f0..12d9755 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/InlineResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/InlineResource.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
import java.io.File;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
/**
* @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
index 4d8f7ed..358b1c3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/PreprocessedResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/PreprocessedResource.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
import java.io.File;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
/**
* @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
index fe536c4..778f4b9 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/config/internal/StandardResource.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/config/internal/StandardResource.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.config.internal;
+package org.apache.felix.sigil.common.config.internal;
import java.io.File;
-import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject;
/**
* @author dave
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
similarity index 68%
rename from sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
index 898cf33..e80f8d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/BldCore.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/BldCore.java
@@ -17,29 +17,29 @@
* under the License.
*/
-package org.apache.felix.sigil.core;
+package org.apache.felix.sigil.common.core;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.felix.sigil.core.internal.license.LicenseManager;
-import org.apache.felix.sigil.core.internal.model.eclipse.Library;
-import org.apache.felix.sigil.core.internal.model.eclipse.LibraryImport;
-import org.apache.felix.sigil.core.internal.model.eclipse.SigilBundle;
-import org.apache.felix.sigil.core.internal.model.osgi.BundleModelElement;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageExport;
-import org.apache.felix.sigil.core.internal.model.osgi.PackageImport;
-import org.apache.felix.sigil.core.internal.model.osgi.RequiredBundle;
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.core.internal.license.LicenseManager;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.Library;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.LibraryImport;
+import org.apache.felix.sigil.common.core.internal.model.eclipse.SigilBundle;
+import org.apache.felix.sigil.common.core.internal.model.osgi.BundleModelElement;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageExport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.PackageImport;
+import org.apache.felix.sigil.common.core.internal.model.osgi.RequiredBundle;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
index 3de3346..7c4ba06 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicenseManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicenseManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.license;
+package org.apache.felix.sigil.common.core.internal.license;
import java.util.Collections;
@@ -25,8 +25,8 @@
import java.util.Set;
import java.util.regex.Pattern;
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
public class LicenseManager implements ILicenseManager
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
index c813ad8..1b3ce5f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/license/LicensePolicy.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/license/LicensePolicy.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.license;
+package org.apache.felix.sigil.common.core.internal.license;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
index 5f18d8f..eb373de 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/BundleCapability.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/BundleCapability.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
- package org.apache.felix.sigil.core.internal.model.eclipse;
+ package org.apache.felix.sigil.common.core.internal.model.eclipse;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
import org.osgi.framework.Version;
public class BundleCapability extends AbstractModelElement implements IBundleCapability
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
index 8b20955..163eaa9 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/Library.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/Library.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
index d8ef81d..f362a2d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/LibraryImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/LibraryImport.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
public class LibraryImport extends AbstractModelElement implements ILibraryImport
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
index 808735d..36fb461 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/eclipse/SigilBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/eclipse/SigilBundle.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.eclipse;
+package org.apache.felix.sigil.common.core.internal.model.eclipse;
import java.io.File;
@@ -35,15 +35,15 @@
import java.util.Collection;
import java.util.jar.JarFile;
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.util.ManifestUtil;
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.util.ManifestUtil;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
index 7fe2c4b..c3febc7 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/BundleModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/BundleModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
import java.net.URI;
@@ -27,13 +27,13 @@
import java.util.HashSet;
import java.util.Set;
-import org.apache.felix.sigil.model.AbstractCompoundModelElement;
-import org.apache.felix.sigil.model.InvalidModelException;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.common.model.InvalidModelException;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
index 2e72d23..8b70562 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageExport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageExport.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
index 2c391ad..5d988de 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/PackageImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/PackageImport.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.InvalidModelException;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.InvalidModelException;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
public class PackageImport extends AbstractModelElement implements IPackageImport
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
index e765a17..e64c284a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/internal/model/osgi/RequiredBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/internal/model/osgi/RequiredBundle.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.felix.sigil.core.internal.model.osgi;
+package org.apache.felix.sigil.common.core.internal.model.osgi;
+import org.apache.felix.sigil.common.model.AbstractModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.eclipse.IBundleCapability;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.AbstractModelElement;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.eclipse.IBundleCapability;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
public class RequiredBundle extends AbstractModelElement implements IRequiredBundle
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
index c78bd16..cd615d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicenseManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicenseManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.licence;
+package org.apache.felix.sigil.common.core.licence;
import java.util.Set;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
index 1180c21..ba2d931 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/licence/ILicensePolicy.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/licence/ILicensePolicy.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.core.licence;
+package org.apache.felix.sigil.common.core.licence;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
similarity index 92%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
index a35466a..b8452ca 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/BundleResolver.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/BundleResolver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.IOException;
@@ -32,25 +32,25 @@
import java.util.Map;
import java.util.Set;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.IRequirementModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IBundleResolver;
-import org.apache.felix.sigil.repository.IRepositoryManager;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
-import org.apache.felix.sigil.repository.ResolutionConfig;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleResolver;
+import org.apache.felix.sigil.common.repository.IRepositoryManager;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.ResolutionConfig;
+import org.apache.felix.sigil.common.repository.ResolutionException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
index b8505cc..05b712e 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/DirectoryHelper.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/DirectoryHelper.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
@@ -26,12 +26,12 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
public class DirectoryHelper
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
index 5dfb7c1..ef46fab 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepository.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
import java.util.ArrayList;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
public class FileSystemRepository extends AbstractBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
similarity index 84%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
index bf05003..d1c9227 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/FileSystemRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/FileSystemRepositoryProvider.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
import java.util.Properties;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
public class FileSystemRepositoryProvider implements IRepositoryProvider
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
index faea5e1..2cb307a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/ProgressWrapper.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/ProgressWrapper.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.repository.IResolutionMonitor;
+import org.apache.felix.sigil.common.repository.IResolutionMonitor;
public class ProgressWrapper implements IProgressMonitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
index 2f5d971..00503f4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepository.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
import java.io.IOException;
import java.util.jar.JarFile;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
public class SystemRepository extends AbstractBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
index 322e29f..47a72f3 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/repository/SystemRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/repository/SystemRepositoryProvider.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.repository;
+package org.apache.felix.sigil.common.core.repository;
import java.io.File;
@@ -26,9 +26,9 @@
import java.io.InputStream;
import java.util.Properties;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
-import org.apache.felix.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
public class SystemRepositoryProvider implements IRepositoryProvider
{
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
index 52b7682..d08388c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/util/ManifestUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/ManifestUtil.java
@@ -1,19 +1,19 @@
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
import java.util.Arrays;
import java.util.Collection;
import java.util.jar.Attributes;
import java.util.jar.Manifest;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+import org.apache.felix.sigil.common.model.ModelElementFactoryException;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
import org.apache.felix.sigil.common.osgi.VersionTable;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.ModelElementFactoryException;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
import org.osgi.framework.Version;
public class ManifestUtil
diff --git a/sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
index fe68920..609463e 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/core/util/QuoteUtil.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/core/util/QuoteUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.core.util;
+package org.apache.felix.sigil.common.core.util;
import java.util.ArrayList;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
index 3561bb4..8343eda 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractCompoundModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractCompoundModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
index 1df6aa7..c2b7e72 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/AbstractModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/AbstractModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.io.Serializable;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
index 0327644..7ec94ef 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ICapabilityModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICapabilityModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface ICapabilityModelElement extends IModelElement
{
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
index 143c7cd..f73b337 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ICompoundModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ICompoundModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.Set;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
index 073b4ce..bafc0be 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.Map;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
index c8cb4fa..adbecee 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelInfo.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelInfo.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface IModelInfo
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
index 93de16f..8588e48 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IModelWalker.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IModelWalker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
/**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
index 7d70630..220e493 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/INamedModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/INamedModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface INamedModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
index ef3f720..bcf29ec 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/IRequirementModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/IRequirementModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public interface IRequirementModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
index eaf3658..7a67697 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/InvalidModelException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/InvalidModelException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
/**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
similarity index 98%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
index 552862c..2798753 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactory.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
index 581f031..392b956 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementFactoryException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementFactoryException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
public class ModelElementFactoryException extends RuntimeException
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
similarity index 99%
rename from sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
index 6c74e77..1bd3757 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/ModelElementSupport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/ModelElementSupport.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.io.Serializable;
@@ -35,7 +35,7 @@
import java.util.WeakHashMap;
import java.util.logging.Logger;
-import org.apache.felix.sigil.model.annotations.Required;
+import org.apache.felix.sigil.common.model.annotations.Required;
public class ModelElementSupport implements Serializable
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
index 03661af..65b7387 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/OverrideOptions.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/OverrideOptions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model;
+package org.apache.felix.sigil.common.model;
import java.util.HashMap;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
index 8e13d4a..a5cc98a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/annotations/Required.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/annotations/Required.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.annotations;
+package org.apache.felix.sigil.common.model.annotations;
import java.lang.annotation.Documented;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
similarity index 88%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
index 263fa6b..0053fd0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/IBundleCapability.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/IBundleCapability.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.osgi.framework.Version;
public interface IBundleCapability extends ICapabilityModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
index c0b5f7d..b9b406d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibrary.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibrary.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
import java.util.Collection;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
index 79e5fa2..5e9b9d4 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ILibraryImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ILibraryImport.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
+import org.apache.felix.sigil.common.model.IModelElement;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
public interface ILibraryImport extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
index 1b6f4bf..812e3dd 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/eclipse/ISigilBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/eclipse/ISigilBundle.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.eclipse;
+package org.apache.felix.sigil.common.model.eclipse;
import java.io.File;
@@ -25,12 +25,12 @@
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.config.Resource;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IVersionedModelElement;
+import org.apache.felix.sigil.common.config.Resource;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IVersionedModelElement;
/**
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
index bd211b9..cc17142 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IBundleModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IBundleModelElement.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import java.net.URI;
import java.util.Collection;
import java.util.Set;
-import org.apache.felix.sigil.model.ICompoundModelElement;
-import org.apache.felix.sigil.model.INamedModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.ICompoundModelElement;
+import org.apache.felix.sigil.common.model.INamedModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
index fbfd9ca..4ad7879 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageExport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageExport.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import java.util.Collection;
-import org.apache.felix.sigil.model.ICapabilityModelElement;
+import org.apache.felix.sigil.common.model.ICapabilityModelElement;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
similarity index 93%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
index 8d6de03..8c10cd5 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageImport.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageImport.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
-import org.apache.felix.sigil.model.IRequirementModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
public interface IPackageImport extends IPackageModelElement, IVersionRangeModelElement, IRequirementModelElement,
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
index 79d618b..c50b2c1 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IPackageModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IPackageModelElement.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public interface IPackageModelElement extends IModelElement
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
index dc04b37..e425fdc 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IRequiredBundle.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IRequiredBundle.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.IRequirementModelElement;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.IRequirementModelElement;
public interface IRequiredBundle extends IModelElement, IRequirementModelElement, Comparable<IRequiredBundle>
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
index 5e3bea5..60c1d6b 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionRangeModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionRangeModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import org.apache.felix.sigil.common.osgi.VersionRange;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
index 8f03acd..cfe75d2 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/model/osgi/IVersionedModelElement.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/model/osgi/IVersionedModelElement.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.model.osgi;
+package org.apache.felix.sigil.common.model.osgi;
import org.osgi.framework.Version;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
similarity index 91%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
index 3baee1f..dc397f0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractBundleRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.io.IOException;
@@ -27,17 +27,17 @@
import java.util.HashSet;
import java.util.jar.Manifest;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.core.licence.ILicenseManager;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.core.util.ManifestUtil;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IPackageExport;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.core.BldCore;
+import org.apache.felix.sigil.common.core.licence.ILicenseManager;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.core.util.ManifestUtil;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IBundleModelElement;
+import org.apache.felix.sigil.common.model.osgi.IPackageExport;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
public abstract class AbstractBundleRepository implements IBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
index 247bce4..73cf4a0 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/AbstractRepositoryManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/AbstractRepositoryManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.ArrayList;
@@ -31,12 +31,12 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.felix.sigil.core.repository.BundleResolver;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.repository.RepositoryChangeEvent.Type;
+import org.apache.felix.sigil.common.core.repository.BundleResolver;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.repository.RepositoryChangeEvent.Type;
public abstract class AbstractRepositoryManager implements IRepositoryManager, IBundleRepositoryListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
similarity index 85%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
index d33d691..ed21a0b 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepository.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepository.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.osgi.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
public interface IBundleRepository
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
index 4b4d45b..df7b208 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleRepositoryListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleRepositoryListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IBundleRepositoryListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
index 42180ef..64a0492 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IBundleResolver.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IBundleResolver.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public interface IBundleResolver
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
index b6c4bd6..0f3e32f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IProviderChangeListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IProviderChangeListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IProviderChangeListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
index 6d85e29..e02445c 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryChangeListener.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryChangeListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public interface IRepositoryChangeListener
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
similarity index 86%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
index f1fc1e8..496ef0f 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryManager.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryManager.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.Collection;
-import org.apache.felix.sigil.model.IModelWalker;
-import org.apache.felix.sigil.model.eclipse.ILibrary;
-import org.apache.felix.sigil.model.eclipse.ILibraryImport;
+import org.apache.felix.sigil.common.model.IModelWalker;
+import org.apache.felix.sigil.common.model.eclipse.ILibrary;
+import org.apache.felix.sigil.common.model.eclipse.ILibraryImport;
public interface IRepositoryManager
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
index 48dc3b2..394753d 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryProvider.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryProvider.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.Properties;
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
similarity index 90%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
index 6258a0f..22c86d2 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IRepositoryVisitor.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IRepositoryVisitor.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IRepositoryVisitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
similarity index 87%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
index 3bb0688..edc07db 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolution.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolution.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import java.util.List;
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IResolution
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
similarity index 85%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
index b55679f..8beaa34 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/IResolutionMonitor.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/IResolutionMonitor.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public interface IResolutionMonitor
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
similarity index 96%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
index 9938db0..7d1c2d8 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryChangeEvent.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryChangeEvent.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class RepositoryChangeEvent
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
similarity index 95%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
index 332bd22..cfa4655 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/RepositoryException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/RepositoryException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class RepositoryException extends Exception
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
similarity index 97%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
index 1ffe3ac..275d0ae 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionConfig.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionConfig.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
public class ResolutionConfig
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
similarity index 94%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
index 9972110..1da491a 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionException.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionException.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
-import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.common.model.IModelElement;
public class ResolutionException extends Exception
diff --git a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
similarity index 89%
rename from sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
rename to sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
index 4c5b676..f31dc91 100644
--- a/sigil/common/core/src/org/apache/felix/sigil/repository/ResolutionMonitorAdapter.java
+++ b/sigil/common/core/src/org/apache/felix/sigil/common/repository/ResolutionMonitorAdapter.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.felix.sigil.repository;
+package org.apache.felix.sigil.common.repository;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
public class ResolutionMonitorAdapter implements IResolutionMonitor