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.obr/META-INF/MANIFEST.MF b/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
index 9a09325..11d068b 100644
--- a/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
+++ b/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: OBR Plug-in
Bundle-SymbolicName: org.cauldron.sigil.obr;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.cauldron.sigil.obr.Activator
+Bundle-Activator: org.apache.felix.sigil.obr.eclipse.Activator
Bundle-Vendor: Paremus Ltd
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -12,5 +12,5 @@
org.cauldron.bld.core
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Import-Package: org.cauldron.bld.obr,
- org.cauldron.sigil.model
+Import-Package: org.apache.felix.sigil.model,
+ org.cauldron.sigil.obr
diff --git a/sigil/org.cauldron.sigil.obr/plugin.xml b/sigil/org.cauldron.sigil.obr/plugin.xml
index 03b79c1..89819f8 100644
--- a/sigil/org.cauldron.sigil.obr/plugin.xml
+++ b/sigil/org.cauldron.sigil.obr/plugin.xml
@@ -31,7 +31,7 @@
<extension
point="org.cauldron.sigil.ui.repositorywizard">
<wizard
- class="org.cauldron.sigil.obr.OBRRepositoryWizard"
+ class="org.apache.felix.sigil.obr.eclipse.OBRRepositoryWizard"
repository="org.cauldron.sigil.obr.provider">
</wizard>
</extension>
diff --git a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
similarity index 97%
rename from sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java
rename to sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
index 4bad94b..45683c8 100644
--- a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/Activator.java
+++ b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/Activator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr.eclipse;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizard.java b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
similarity index 88%
rename from sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizard.java
rename to sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
index 79e0e72..8f06603 100644
--- a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizard.java
+++ b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizard.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr.eclipse;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
public class OBRRepositoryWizard extends RepositoryWizard {
diff --git a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
similarity index 93%
rename from sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java
rename to sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
index a607ac1..babb384 100644
--- a/sigil/org.cauldron.sigil.obr/src/org/cauldron/sigil/obr/OBRRepositoryWizardPage.java
+++ b/sigil/org.cauldron.sigil.obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr.eclipse;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizard;
-import org.cauldron.sigil.ui.wizard.repository.RepositoryWizardPage;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizard;
+import org.apache.felix.sigil.ui.eclipse.ui.wizard.repository.RepositoryWizardPage;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.DirectoryFieldEditor;