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/ivy/resolver/sigil.properties b/sigil/ivy/resolver/sigil.properties
index 6739b7d..6fd12b2 100644
--- a/sigil/ivy/resolver/sigil.properties
+++ b/sigil/ivy/resolver/sigil.properties
@@ -13,17 +13,17 @@
org.apache.felix.sigil.*, \
-imports: \
- 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.obr, \
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.obr, \
- org.apache.felix.sigil.repository, \
+ org.apache.felix.sigil.common.repository, \
org.apache.ivy, \
org.apache.ivy.core, \
org.apache.ivy.core.module.descriptor, \
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
index 0f0d1f3..712f372 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ant/BundleTask.java
@@ -26,10 +26,10 @@
import java.util.List;
import java.util.Properties;
-import org.apache.felix.sigil.bnd.BundleBuilder;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.bnd.BundleBuilder;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
index c1269a2..9670dcd 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldRepositoryManager.java
@@ -24,10 +24,10 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.config.IRepositoryConfig;
-import org.apache.felix.sigil.repository.AbstractRepositoryManager;
-import org.apache.felix.sigil.repository.IBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
public class BldRepositoryManager extends AbstractRepositoryManager
{
@@ -36,11 +36,11 @@
static
{
aliases.put("filesystem",
- "org.apache.felix.sigil.core.repository.FileSystemRepositoryProvider");
- aliases.put("obr", "org.apache.felix.sigil.obr.OBRRepositoryProvider");
+ "org.apache.felix.sigil.common.core.repository.FileSystemRepositoryProvider");
+ aliases.put("obr", "org.apache.felix.sigil.common.obr.OBRRepositoryProvider");
aliases.put("project", "org.apache.felix.sigil.ivy.ProjectRepositoryProvider");
aliases.put("system",
- "org.apache.felix.sigil.core.repository.SystemRepositoryProvider");
+ "org.apache.felix.sigil.common.core.repository.SystemRepositoryProvider");
};
private Map<String, Properties> repos;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
index cf25fd0..48ddd12d 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/BldResolver.java
@@ -23,13 +23,13 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.felix.sigil.core.BldCore;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-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.IModelElement;
+import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
+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;
public class BldResolver implements IBldResolver
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
index 25a3bcf..e338349 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/IBldResolver.java
@@ -20,9 +20,9 @@
package org.apache.felix.sigil.ivy;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
public interface IBldResolver
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
index 2f9e58a..703dabe 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepository.java
@@ -29,20 +29,20 @@
import java.util.List;
import java.util.Map;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+import org.apache.felix.sigil.common.config.IBldProject.IBldBundle;
+import org.apache.felix.sigil.common.core.licence.ILicensePolicy;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+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.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-import org.apache.felix.sigil.config.IBldProject.IBldBundle;
-import org.apache.felix.sigil.core.licence.ILicensePolicy;
-import org.apache.felix.sigil.model.ModelElementFactory;
-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.repository.AbstractBundleRepository;
-import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
index e47b0f3..e081344 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/ProjectRepositoryProvider.java
@@ -23,9 +23,9 @@
import java.util.HashMap;
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 ProjectRepositoryProvider implements IRepositoryProvider
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
index 52701e7..e7eb9fe 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilParser.java
@@ -31,15 +31,15 @@
import java.util.Map;
import java.util.regex.Pattern;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.config.IBldProject;
+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.IPackageImport;
+import org.apache.felix.sigil.common.model.osgi.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.config.IBldProject;
-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.IPackageImport;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.common.repository.IResolution;
import org.apache.ivy.Ivy;
import org.apache.ivy.core.IvyContext;
import org.apache.ivy.core.module.descriptor.Artifact;
diff --git a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
index 0896812..e1e243a 100644
--- a/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
+++ b/sigil/ivy/resolver/src/org/apache/felix/sigil/ivy/SigilResolver.java
@@ -37,15 +37,15 @@
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
+import org.apache.felix.sigil.common.config.BldFactory;
+import org.apache.felix.sigil.common.model.IModelElement;
+import org.apache.felix.sigil.common.model.ModelElementFactory;
+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.IRequiredBundle;
import org.apache.felix.sigil.common.osgi.VersionRange;
-import org.apache.felix.sigil.config.BldFactory;
-import org.apache.felix.sigil.model.IModelElement;
-import org.apache.felix.sigil.model.ModelElementFactory;
-import org.apache.felix.sigil.model.eclipse.ISigilBundle;
-import org.apache.felix.sigil.model.osgi.IBundleModelElement;
-import org.apache.felix.sigil.model.osgi.IRequiredBundle;
-import org.apache.felix.sigil.repository.IResolution;
-import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.common.repository.IResolution;
+import org.apache.felix.sigil.common.repository.ResolutionException;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
import org.apache.ivy.core.module.id.ModuleRevisionId;