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.bld.obr/META-INF/MANIFEST.MF b/sigil/org.cauldron.bld.obr/META-INF/MANIFEST.MF
index 20dfeea..1728047 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.bld.obr
+Export-Package: org.cauldron.sigil.obr
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/AbstractOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
similarity index 96%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/AbstractOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
index 71c033d..d363e61 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/AbstractOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/AbstractOBRBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.io.FileOutputStream;
@@ -30,7 +30,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.cauldron.sigil.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.repository.AbstractBundleRepository;
public abstract class AbstractOBRBundleRepository extends AbstractBundleRepository {
private static SAXParserFactory factory = SAXParserFactory.newInstance();
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/CachingOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
similarity index 93%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/CachingOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
index f0ed825..6d3de79 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/CachingOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/CachingOBRBundleRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.lang.ref.SoftReference;
@@ -26,8 +26,8 @@
import java.util.List;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
public class CachingOBRBundleRepository extends AbstractOBRBundleRepository {
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/NonCachingOBRBundleRepository.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
similarity index 88%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/NonCachingOBRBundleRepository.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
index 4c11840..d3eb5dd 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/NonCachingOBRBundleRepository.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/NonCachingOBRBundleRepository.java
@@ -17,18 +17,17 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.URL;
-import org.cauldron.bld.core.BldCore;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
-import org.cauldron.sigil.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.repository.IRepositoryVisitor;
public class NonCachingOBRBundleRepository extends AbstractOBRBundleRepository {
- public static void main(String[] args) throws Exception {
+ /*public static void main(String[] args) throws Exception {
String url = args[0];
String obr = args[1];
String cache = args[2];
@@ -41,7 +40,7 @@
return true;
}
});
- }
+ } */
public NonCachingOBRBundleRepository(String id, URL repositoryURL, File obrCache, File bundleCache, long updatePeriod) {
super(id, repositoryURL, obrCache, bundleCache, updatePeriod);
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRHandler.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
similarity index 92%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRHandler.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
index b090521..ca725c4 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRHandler.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.URI;
@@ -29,17 +29,17 @@
import java.util.LinkedList;
import java.util.List;
-import org.cauldron.sigil.model.ModelElementFactory;
-import org.cauldron.sigil.model.common.LDAPExpr;
-import org.cauldron.sigil.model.common.LDAPParseException;
-import org.cauldron.sigil.model.common.LDAPParser;
-import org.cauldron.sigil.model.common.SimpleTerm;
-import org.cauldron.sigil.model.common.VersionRange;
-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.apache.felix.sigil.model.ModelElementFactory;
+import org.apache.felix.sigil.model.common.LDAPExpr;
+import org.apache.felix.sigil.model.common.LDAPParseException;
+import org.apache.felix.sigil.model.common.LDAPParser;
+import org.apache.felix.sigil.model.common.SimpleTerm;
+import org.apache.felix.sigil.model.common.VersionRange;
+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.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.osgi.framework.Version;
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRListener.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
similarity index 90%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRListener.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
index ae7bdd2..bbd4d42 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRListener.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRListener.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
-import org.cauldron.sigil.model.eclipse.ISigilBundle;
+import org.apache.felix.sigil.model.eclipse.ISigilBundle;
public interface OBRListener {
void handleBundle(ISigilBundle bundle);
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRRepositoryProvider.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
similarity index 89%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRRepositoryProvider.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
index 4653d38..fa5b93a 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/OBRRepositoryProvider.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/OBRRepositoryProvider.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.io.File;
import java.net.MalformedURLException;
@@ -25,9 +25,9 @@
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.cauldron.sigil.repository.IBundleRepository;
-import org.cauldron.sigil.repository.IRepositoryProvider;
-import org.cauldron.sigil.repository.RepositoryException;
+import org.apache.felix.sigil.repository.IBundleRepository;
+import org.apache.felix.sigil.repository.IRepositoryProvider;
+import org.apache.felix.sigil.repository.RepositoryException;
public class OBRRepositoryProvider implements IRepositoryProvider {
public IBundleRepository createRepository(String id, Properties preferences) throws RepositoryException {
diff --git a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/VersionRangeHelper.java b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
similarity index 93%
rename from sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/VersionRangeHelper.java
rename to sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
index 50b0fb1..f7c147a 100644
--- a/sigil/org.cauldron.bld.obr/src/org/cauldron/bld/obr/VersionRangeHelper.java
+++ b/sigil/org.cauldron.bld.obr/src/org/cauldron/sigil/obr/VersionRangeHelper.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package org.cauldron.bld.obr;
+package org.cauldron.sigil.obr;
import java.util.ArrayList;
import java.util.List;
-import org.cauldron.sigil.model.common.LDAPExpr;
-import org.cauldron.sigil.model.common.LDAPParseException;
-import org.cauldron.sigil.model.common.LDAPParser;
-import org.cauldron.sigil.model.common.Not;
-import org.cauldron.sigil.model.common.Ops;
-import org.cauldron.sigil.model.common.SimpleTerm;
-import org.cauldron.sigil.model.common.VersionRange;
+import org.apache.felix.sigil.model.common.LDAPExpr;
+import org.apache.felix.sigil.model.common.LDAPParseException;
+import org.apache.felix.sigil.model.common.LDAPParser;
+import org.apache.felix.sigil.model.common.Not;
+import org.apache.felix.sigil.model.common.Ops;
+import org.apache.felix.sigil.model.common.SimpleTerm;
+import org.apache.felix.sigil.model.common.VersionRange;
import org.osgi.framework.Version;
class VersionRangeHelper {