large package refactor towards org.apache.felix namespace (FELIX-1326)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@793825 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF b/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF
index f9bcf63..439f076 100644
--- a/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF
+++ b/sigil/org.cauldron.sigil.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: org.cauldron.sigil.core
Bundle-SymbolicName: org.cauldron.sigil.core;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.SigilCore
+Bundle-Activator: org.apache.felix.sigil.eclipse.SigilCore
Bundle-Vendor: Paremus Ltd.
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.expressions,
@@ -15,13 +15,13 @@
org.cauldron.sigil.utils,
org.cauldron.bld.core
Bundle-ActivationPolicy: lazy
-Export-Package: org.cauldron.sigil,
- org.cauldron.sigil.install,
- org.cauldron.sigil.job,
- org.cauldron.sigil.model.project,
- org.cauldron.sigil.model.repository,
- org.cauldron.sigil.model.util,
- org.cauldron.sigil.preferences
+Export-Package: org.apache.felix.sigil.eclipse,
+ org.apache.felix.sigil.eclipse.install,
+ org.apache.felix.sigil.eclipse.job,
+ org.apache.felix.sigil.eclipse.model.project,
+ org.apache.felix.sigil.eclipse.model.repository,
+ org.apache.felix.sigil.eclipse.model.util,
+ org.apache.felix.sigil.eclipse.preferences
Bundle-ClassPath: .,
lib/commons-lang-2.4.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/sigil/org.cauldron.sigil.core/plugin.xml b/sigil/org.cauldron.sigil.core/plugin.xml
index 3128c58..f2964dd 100644
--- a/sigil/org.cauldron.sigil.core/plugin.xml
+++ b/sigil/org.cauldron.sigil.core/plugin.xml
@@ -36,7 +36,7 @@
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.cauldron.sigil.property.SigilPropertyTester"
+ class="org.apache.felix.sigil.property.SigilPropertyTester"
id="org.cauldron.sigil.property.NewtonPropertyTester"
namespace="org.cauldron.sigil"
properties="isNewtonResource,isCompositeResource,isSystemResource,isScriptResource,isSigilProject"
@@ -46,13 +46,13 @@
point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.core.resources.IFile"
- class="org.cauldron.sigil.internal.adapter.FileAdaptorFactory">
+ class="org.apache.felix.sigil.eclipse.internal.adapter.FileAdaptorFactory">
<adapter type="org.cauldron.sigil.model.eclipse.ISigilBundle"/>
</factory>
<factory
adaptableType="org.eclipse.core.resources.IProject"
- class="org.cauldron.sigil.internal.adapter.ProjectAdaptorFactory">
- <adapter type="org.cauldron.sigil.model.project.ISigilProjectModel"/>
+ class="org.apache.felix.sigil.eclipse.internal.adapter.ProjectAdaptorFactory">
+ <adapter type="org.apache.felix.sigil.model.project.ISigilProjectModel"/>
</factory>
</extension>
<extension
@@ -60,7 +60,7 @@
name="Sigil Nature"
point="org.eclipse.core.resources.natures">
<runtime>
- <run class="org.cauldron.sigil.nature.SigilProjectNature"/>
+ <run class="org.apache.felix.sigil.nature.SigilProjectNature"/>
</runtime>
</extension>
<extension
@@ -70,19 +70,19 @@
<builder
hasNature="false"
isConfigurable="false">
- <run class="org.cauldron.sigil.internal.builders.SigilIncrementalProjectBuilder"/>
+ <run class="org.apache.felix.sigil.eclipse.internal.builders.SigilIncrementalProjectBuilder"/>
</builder>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
<initializer
- class="org.cauldron.sigil.preferences.SigilPreferencesInitializer">
+ class="org.apache.felix.sigil.preferences.SigilPreferencesInitializer">
</initializer>
</extension>
<extension
point="org.cauldron.sigil.repositoryprovider">
<provider
- class="org.cauldron.sigil.internal.repository.eclipse.WorkspaceRepositoryProvider"
+ class="org.apache.felix.sigil.eclipse.internal.repository.eclipse.WorkspaceRepositoryProvider"
defaultLevel="-3"
dynamic="false"
id="org.cauldron.sigil.core.workspaceprovider"
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java
similarity index 92%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java
index b0e123e..9c7656a 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/SigilCore.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/SigilCore.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil;
+package org.apache.felix.sigil.eclipse;
import java.io.IOException;
import java.io.InputStream;
@@ -31,25 +31,25 @@
import java.util.ResourceBundle;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.install.IOSGiInstallManager;
-import org.cauldron.sigil.internal.install.OSGiInstallManager;
-import org.cauldron.sigil.internal.model.project.SigilModelRoot;
-import org.cauldron.sigil.internal.model.project.SigilProject;
-import org.cauldron.sigil.internal.model.repository.RepositoryConfiguration;
-import org.cauldron.sigil.internal.repository.eclipse.GlobalRepositoryManager;
-import org.cauldron.sigil.internal.repository.eclipse.SigilRepositoryManager;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilModelRoot;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.repository.IRepositoryConfiguration;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
-import org.cauldron.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
+import org.apache.felix.sigil.eclipse.internal.install.OSGiInstallManager;
+import org.apache.felix.sigil.eclipse.internal.model.project.SigilModelRoot;
+import org.apache.felix.sigil.eclipse.internal.model.project.SigilProject;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.GlobalRepositoryManager;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
+import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.repository.ResolutionConfig;
import org.eclipse.core.resources.ICommand;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstall.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstall.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
index 3e91ca1..5cf85dc 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstall.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstall.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Map;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallBuilder.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
similarity index 95%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallBuilder.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
index ce066ea..42329a6 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallBuilder.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallManager.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
similarity index 95%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallManager.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
index c33f746..a3776bc 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallManager.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
public interface IOSGiInstallManager {
IOSGiInstall findInstall(String id);
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallType.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallType.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
index f975151..6a2cdd5 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/IOSGiInstallType.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/IOSGiInstallType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.graphics.Image;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstall.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
similarity index 97%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstall.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
index 633f1f3..4316e6f 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstall.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstall.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Arrays;
import java.util.Map;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstallType.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
similarity index 98%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstallType.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
index e584f1c..c670363 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/install/OSGiInstallType.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/install/OSGiInstallType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.install;
+package org.apache.felix.sigil.eclipse.install;
import java.util.Arrays;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/FileAdaptorFactory.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
similarity index 87%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/FileAdaptorFactory.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
index 4b63ad3..e8c8ee2 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/FileAdaptorFactory.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/FileAdaptorFactory.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.sigil.internal.adapter;
+package org.apache.felix.sigil.eclipse.internal.adapter;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.ModelElementFactoryException;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/ProjectAdaptorFactory.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
similarity index 91%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/ProjectAdaptorFactory.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
index 4811476..d6a3543 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/adapter/ProjectAdaptorFactory.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/adapter/ProjectAdaptorFactory.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.internal.adapter;
+package org.apache.felix.sigil.eclipse.internal.adapter;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdapterFactory;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/BuildConsole.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
similarity index 95%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/BuildConsole.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
index 5ac8117..bd96066 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/BuildConsole.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/BuildConsole.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.builders;
+package org.apache.felix.sigil.eclipse.internal.builders;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.console.MessageConsole;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/SigilIncrementalProjectBuilder.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/SigilIncrementalProjectBuilder.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
index acea59a..c521e07 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/builders/SigilIncrementalProjectBuilder.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/builders/SigilIncrementalProjectBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.builders;
+package org.apache.felix.sigil.eclipse.internal.builders;
import java.io.File;
import java.util.ArrayList;
@@ -26,11 +26,11 @@
import java.util.Map;
import java.util.Properties;
-import org.cauldron.bld.bnd.BundleBuilder;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
+import org.apache.felix.sigil.bnd.BundleBuilder;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/install/OSGiInstallManager.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
similarity index 95%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/install/OSGiInstallManager.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
index ce5f20f..98bc195 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/install/OSGiInstallManager.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/install/OSGiInstallManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.install;
+package org.apache.felix.sigil.eclipse.internal.install;
import java.util.Collections;
import java.util.Comparator;
@@ -25,11 +25,11 @@
import java.util.LinkedList;
import java.util.Map;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstall;
-import org.cauldron.sigil.install.IOSGiInstallBuilder;
-import org.cauldron.sigil.install.IOSGiInstallManager;
-import org.cauldron.sigil.install.IOSGiInstallType;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallBuilder;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstallType;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilModelRoot.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
similarity index 79%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilModelRoot.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
index ea05121..050ce1f 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilModelRoot.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilModelRoot.java
@@ -17,28 +17,28 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.project;
+package org.apache.felix.sigil.eclipse.internal.model.project;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ILibrary;
-import org.cauldron.sigil.model.eclipse.ILibraryImport;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilModelRoot;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.IBundleResolver;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+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.IBundleResolver;
+import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilProject.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
similarity index 91%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilProject.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
index 7a7f3af..62f6734 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/project/SigilProject.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/project/SigilProject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.project;
+package org.apache.felix.sigil.eclipse.internal.model.project;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,26 +27,26 @@
import java.util.Arrays;
import java.util.Collection;
-import org.cauldron.bld.config.BldFactory;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.job.ThreadProgressMonitor;
-import org.cauldron.sigil.model.AbstractCompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.model.util.JavaHelper;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
+import org.apache.felix.sigil.config.BldFactory;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.job.ThreadProgressMonitor;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
+import org.apache.felix.sigil.model.AbstractCompoundModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelWalker;
+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.IRepositoryManager;
+import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryConfiguration.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
similarity index 95%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryConfiguration.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
index 592e75b..8599062 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryConfiguration.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryConfiguration.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
import java.io.File;
import java.io.IOException;
@@ -29,14 +29,14 @@
import java.util.Map;
import java.util.UUID;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryConfiguration;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.model.repository.RepositorySet;
-import org.cauldron.sigil.preferences.PrefsUtils;
-import org.cauldron.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryConfiguration;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.RepositorySet;
+import org.apache.felix.sigil.eclipse.preferences.PrefsUtils;
+import org.apache.felix.sigil.repository.IBundleRepository;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryModel.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
similarity index 91%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryModel.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
index 9b72541..bfc555a 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryModel.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.jface.preference.PreferenceStore;
public class RepositoryModel implements IRepositoryModel {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryType.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
similarity index 93%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryType.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
index 30525a4..beaa0ea 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/model/repository/RepositoryType.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.internal.model.repository;
+package org.apache.felix.sigil.eclipse.internal.model.repository;
-import org.cauldron.sigil.model.repository.IRepositoryType;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
import org.eclipse.swt.graphics.Image;
public class RepositoryType implements IRepositoryType {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/GlobalRepositoryManager.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
similarity index 77%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/GlobalRepositoryManager.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
index c974644..51bff92 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/GlobalRepositoryManager.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.internal.repository.eclipse.SigilRepositoryManager;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.repository.eclipse.SigilRepositoryManager;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.repository.IRepositoryManager;
public class GlobalRepositoryManager extends SigilRepositoryManager implements
IRepositoryManager {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepository.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
similarity index 85%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepository.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
index 186e962..7747dc9 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepository.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.io.File;
import java.io.IOException;
@@ -28,15 +28,15 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.install.IOSGiInstall;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.ModelElementFactoryException;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.install.IOSGiInstall;
+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.repository.IRepositoryVisitor;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepositoryProvider.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
similarity index 84%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
index 043eb81..0d76fe8 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/OSGiInstallRepositoryProvider.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
public class OSGiInstallRepositoryProvider implements IRepositoryProvider {
public IBundleRepository createRepository(String id, Properties preferences) {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/SigilRepositoryManager.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
similarity index 89%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/SigilRepositoryManager.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
index 0b4b757..8bd1095 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/SigilRepositoryManager.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -28,15 +28,15 @@
import java.util.Iterator;
import java.util.Properties;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.repository.IRepositoryModel;
-import org.cauldron.sigil.model.repository.IRepositorySet;
-import org.cauldron.sigil.model.repository.IRepositoryType;
-import org.cauldron.sigil.repository.AbstractRepositoryManager;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositorySet;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.apache.felix.sigil.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryManager;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepository.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
similarity index 90%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepository.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
index d144e6f..076261e 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepository.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepository.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.ArrayList;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepositoryProvider.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
similarity index 88%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepositoryProvider.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
index b67aa25..3a2744c 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/internal/repository/eclipse/WorkspaceRepositoryProvider.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/WorkspaceRepositoryProvider.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.internal.repository.eclipse;
+package org.apache.felix.sigil.eclipse.internal.repository.eclipse;
import java.util.Properties;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.ResourcesPlugin;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ResolveProjectsJob.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
similarity index 89%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ResolveProjectsJob.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
index 243dccf..f2280e8 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ResolveProjectsJob.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ResolveProjectsJob.java
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.cauldron.sigil.job;
+package org.apache.felix.sigil.eclipse.job;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.IBundleResolver;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.osgi.IPackageImport;
+import org.apache.felix.sigil.model.osgi.IRequiredBundle;
+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.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ThreadProgressMonitor.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ThreadProgressMonitor.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
index 5c526d0..6d6989d 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/job/ThreadProgressMonitor.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/job/ThreadProgressMonitor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.job;
+package org.apache.felix.sigil.eclipse.job;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilModelRoot.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
similarity index 88%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilModelRoot.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
index 2c9b53a..e6a9a9a 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilModelRoot.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilModelRoot.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.cauldron.sigil.model.project;
+package org.apache.felix.sigil.eclipse.model.project;
import java.util.Collection;
import java.util.List;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilProjectModel.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
similarity index 90%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilProjectModel.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
index ebb8fe9..f1a2b0a 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/project/ISigilProjectModel.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/project/ISigilProjectModel.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package org.cauldron.sigil.model.project;
+package org.apache.felix.sigil.eclipse.model.project;
import java.util.Collection;
-import org.cauldron.bld.config.IBldProject;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.config.IBldProject;
+import org.apache.felix.sigil.core.BldCore;
+import org.apache.felix.sigil.model.ICompoundModelElement;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryConfiguration.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
similarity index 91%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryConfiguration.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
index 7c62e6c..66487a4 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryConfiguration.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryConfiguration.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
import java.util.List;
import java.util.Map;
-import org.cauldron.sigil.internal.model.repository.RepositoryType;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryType;
import org.eclipse.core.runtime.CoreException;
public interface IRepositoryConfiguration {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryModel.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryModel.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
index 182998f..70fc90d 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryModel.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
import org.eclipse.jface.preference.PreferenceStore;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositorySet.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositorySet.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
index b4e644b..acd6523 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositorySet.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositorySet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
public interface IRepositorySet {
void setRepository(IRepositoryModel id, int position);
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryType.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryType.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
index 33df100..ed673fb 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/IRepositoryType.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
import org.eclipse.swt.graphics.Image;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/RepositorySet.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/RepositorySet.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
index 5630a6d..557cb77 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/repository/RepositorySet.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/repository/RepositorySet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.repository;
+package org.apache.felix.sigil.eclipse.model.repository;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/Grep.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
similarity index 98%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/Grep.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
index b2c7854..009f2f1 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/Grep.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/Grep.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
import java.io.FileInputStream;
import java.io.IOException;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/JavaHelper.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/JavaHelper.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
index 1c87c87..a28771f 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/JavaHelper.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/JavaHelper.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
import java.io.File;
import java.io.FileInputStream;
@@ -38,23 +38,23 @@
import java.util.jar.JarInputStream;
import java.util.regex.Pattern;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.VersionRange;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
-import org.cauldron.sigil.model.eclipse.ISCAComposite;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.repository.IRepositoryManager;
-import org.cauldron.sigil.repository.IResolution;
-import org.cauldron.sigil.repository.ResolutionConfig;
-import org.cauldron.sigil.repository.ResolutionException;
-import org.cauldron.sigil.repository.ResolutionMonitorAdapter;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.model.IModelElement;
+import org.apache.felix.sigil.model.IModelWalker;
+import org.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.model.eclipse.ISCAComposite;
+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.IRepositoryManager;
+import org.apache.felix.sigil.repository.IResolution;
+import org.apache.felix.sigil.repository.ResolutionConfig;
+import org.apache.felix.sigil.repository.ResolutionException;
+import org.apache.felix.sigil.repository.ResolutionMonitorAdapter;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ModelHelper.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
similarity index 82%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ModelHelper.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
index a9f5017..690fc8a 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ModelHelper.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ModelHelper.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
import java.util.LinkedList;
import java.util.List;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.ICompoundModelElement;
-import org.cauldron.sigil.model.IModelElement;
-import org.cauldron.sigil.model.IModelWalker;
-import org.cauldron.sigil.model.osgi.IBundleModelElement;
-import org.cauldron.sigil.model.osgi.IPackageExport;
-import org.cauldron.sigil.model.osgi.IPackageImport;
-import org.cauldron.sigil.model.osgi.IRequiredBundle;
+import org.apache.felix.sigil.eclipse.SigilCore;
+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.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;
public class ModelHelper {
public static List<IModelElement> findUsers(IModelElement e) {
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ProfileManager.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ProfileManager.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
index b42287c..751a0bb 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/model/util/ProfileManager.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/model/util/ProfileManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.model.util;
+package org.apache.felix.sigil.eclipse.model.util;
import java.io.IOException;
import java.io.InputStream;
@@ -28,9 +28,9 @@
import java.util.Properties;
import java.util.regex.Pattern;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.model.project.ISigilProjectModel;
-import org.cauldron.sigil.utils.GlobCompiler;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.utils.GlobCompiler;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Bundle;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/nature/SigilProjectNature.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/nature/SigilProjectNature.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
index b425fa2..7908789 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/nature/SigilProjectNature.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/nature/SigilProjectNature.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.nature;
+package org.apache.felix.sigil.eclipse.nature;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectNature;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PrefsUtils.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
similarity index 96%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PrefsUtils.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
index 0635220..8e17fd8 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PrefsUtils.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PrefsUtils.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.preferences;
+package org.apache.felix.sigil.eclipse.preferences;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PromptablePreference.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PromptablePreference.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
index 4feb070..235f626 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/PromptablePreference.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/PromptablePreference.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.preferences;
+package org.apache.felix.sigil.eclipse.preferences;
public enum PromptablePreference {
Always, Prompt, Never
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/SigilPreferencesInitializer.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
similarity index 88%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/SigilPreferencesInitializer.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
index 6d2e1e2..5f81c12 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/preferences/SigilPreferencesInitializer.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/preferences/SigilPreferencesInitializer.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.cauldron.sigil.preferences;
+package org.apache.felix.sigil.eclipse.preferences;
-import org.cauldron.sigil.SigilCore;
-import org.cauldron.sigil.internal.model.repository.RepositoryConfiguration;
-import org.cauldron.sigil.model.common.VersionRangeBoundingRule;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryConfiguration;
+import org.apache.felix.sigil.model.common.VersionRangeBoundingRule;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/property/SigilPropertyTester.java b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
similarity index 94%
rename from sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/property/SigilPropertyTester.java
rename to sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
index ae85568..34f3adf 100644
--- a/sigil/org.cauldron.sigil.core/src/org/cauldron/sigil/property/SigilPropertyTester.java
+++ b/sigil/org.cauldron.sigil.core/src/org/apache/felix/sigil/eclipse/property/SigilPropertyTester.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.property;
+package org.apache.felix.sigil.eclipse.property;
-import org.cauldron.sigil.SigilCore;
+import org.apache.felix.sigil.eclipse.SigilCore;
import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;