further org.cauldron refactoring (FELIX-1326)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@793860 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF b/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
index 1728047..bfba359 100644
--- a/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
+++ b/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@
Require-Bundle: org.cauldron.bld.core;bundle-version="0.6.0",
org.eclipse.equinox.common;bundle-version="3.4.0"
Import-Package: org.osgi.framework;version="1.4.0"
-Export-Package: org.cauldron.sigil.obr
+Export-Package: org.apache.felix.sigil.obr
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
similarity index 98%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
index d363e61..ad626b7 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/AbstractOBRBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
similarity index 98%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
index 6d3de79..c18cce6 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/CachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.io.File;
import java.lang.ref.SoftReference;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
similarity index 98%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
index d3eb5dd..1deadb3 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/NonCachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.io.File;
import java.net.URL;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRHandler.java
similarity index 99%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRHandler.java
index ca725c4..aa8737c 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.io.File;
import java.net.URI;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRListener.java
similarity index 96%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRListener.java
index bbd4d42..5cef89c 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import org.apache.felix.sigil.model.eclipse.ISigilBundle;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
similarity index 97%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
index fa5b93a..07a2442 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/OBRRepositoryProvider.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.io.File;
import java.net.MalformedURLException;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
similarity index 99%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
rename to sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
index f7c147a..c00d744 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
+++ b/sigil/org.cauldron.bld.obr/src/org/apache/felix/sigil/obr/VersionRangeHelper.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.sigil.obr;
+package org.apache.felix.sigil.obr;
import java.util.ArrayList;
import java.util.List;
diff --git a/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF b/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
index 11d068b..9d4002c 100644
--- a/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
+++ b/sigil/org.cauldron.sigil.obr/META-INF/MANIFEST.MF
@@ -13,4 +13,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.felix.sigil.model,
- org.cauldron.sigil.obr
+ org.apache.felix.sigil.obr