final references to org.cauldron packages removed from source (FELIX-1326)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@793955 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/bld-ivy/example/dependence/dependee/build.xml b/sigil/bld-ivy/example/dependence/dependee/build.xml
index 4eab164..c2c124b 100644
--- a/sigil/bld-ivy/example/dependence/dependee/build.xml
+++ b/sigil/bld-ivy/example/dependence/dependee/build.xml
@@ -48,7 +48,7 @@
<ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="org.apache.felix.sigil.ant.BundleTask"
classpath="${sigil-ivy-plugin.jar}"/>
</target>
diff --git a/sigil/bld-ivy/example/dependence/depender/build.xml b/sigil/bld-ivy/example/dependence/depender/build.xml
index f2f9190..aebdb1c 100644
--- a/sigil/bld-ivy/example/dependence/depender/build.xml
+++ b/sigil/bld-ivy/example/dependence/depender/build.xml
@@ -48,7 +48,7 @@
<ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="org.apache.felix.sigil.ant.BundleTask"
classpath="${sigil-ivy-plugin.jar}"/>
</target>
diff --git a/sigil/bld-ivy/example/dependence/settings/ivysettings.xml b/sigil/bld-ivy/example/dependence/settings/ivysettings.xml
index 5dd4e63..ee0ff48 100644
--- a/sigil/bld-ivy/example/dependence/settings/ivysettings.xml
+++ b/sigil/bld-ivy/example/dependence/settings/ivysettings.xml
@@ -23,8 +23,8 @@
<caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
<classpath file="${sigil-ivy-plugin.jar}" />
- <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
- <typedef name="sigil-resolver" classname="org.cauldron.bld.ivy.SigilResolver" />
+ <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+ <typedef name="sigil-resolver" classname="org.apache.felix.sigil.ivy.SigilResolver" />
<parsers>
<sigil-parser/>
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/common.xml b/sigil/bld-ivy/example/felix-log/bldcommon/common.xml
index 8431484..aedc2ec 100644
--- a/sigil/bld-ivy/example/felix-log/bldcommon/common.xml
+++ b/sigil/bld-ivy/example/felix-log/bldcommon/common.xml
@@ -55,7 +55,7 @@
classpath="${ivy.jar}"/>
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="oorg.apache.felix.sigil.ant.BundleTask"
classpath="${sigil-ivy-plugin.jar}"/>
</target>
diff --git a/sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml b/sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml
index dd336c7..a1fb903 100644
--- a/sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml
+++ b/sigil/bld-ivy/example/felix-log/bldcommon/ivysettings.xml
@@ -24,8 +24,8 @@
<settings defaultResolver="local" circularDependencyStrategy="error" />
<classpath file="${sigil-ivy-plugin.jar}" />
- <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
- <typedef name="sigil" classname="org.cauldron.bld.ivy.SigilResolver" />
+ <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+ <typedef name="sigil" classname="org.apache.felix.sigil.ivy.SigilResolver" />
<parsers>
<sigil-parser config="${ivy.settings.dir}/sigil-repos.properties"
diff --git a/sigil/bld-ivy/example/multi-project/common/common.xml b/sigil/bld-ivy/example/multi-project/common/common.xml
index f464e32..311cffd 100644
--- a/sigil/bld-ivy/example/multi-project/common/common.xml
+++ b/sigil/bld-ivy/example/multi-project/common/common.xml
@@ -56,7 +56,7 @@
classpath="${ivy.jar}"/>
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="org.apache.felix.sigil.ant.BundleTask"
classpath="${sigil-ivy-plugin.jar}"/>
</target>
diff --git a/sigil/bld-ivy/example/multi-project/common/ivysettings.xml b/sigil/bld-ivy/example/multi-project/common/ivysettings.xml
index 614aa0e..f2f7454 100644
--- a/sigil/bld-ivy/example/multi-project/common/ivysettings.xml
+++ b/sigil/bld-ivy/example/multi-project/common/ivysettings.xml
@@ -24,8 +24,8 @@
<settings defaultResolver="shared" circularDependencyStrategy="error" />
<classpath file="${ivy.settings.dir}/../../../lib/sigil-ivy-plugin.jar" />
- <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
- <typedef name="sigil-resolver" classname="org.cauldron.bld.ivy.SigilResolver" />
+ <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+ <typedef name="sigil-resolver" classname="org.apache.felix.sigil.ivy.SigilResolver" />
<parsers>
<sigil-parser quiet="true"/>
diff --git a/sigil/bld-ivy/sigil-ivy-plugin.bnd b/sigil/bld-ivy/sigil-ivy-plugin.bnd
index 7fb4156..799b4c4 100644
--- a/sigil/bld-ivy/sigil-ivy-plugin.bnd
+++ b/sigil/bld-ivy/sigil-ivy-plugin.bnd
@@ -12,7 +12,7 @@
# embed other dependencies directly in the plugin
Private-Package: \
- org.cauldron.*, \
+ org.apache.felix.sigil.*, \
profiles.*, \
org.eclipse.core.runtime, \
org.osgi.framework
diff --git a/sigil/bld-ivy/test/config/proj1/newton-project.xml b/sigil/bld-ivy/test/config/proj1/newton-project.xml
deleted file mode 100644
index 98a52cd..0000000
--- a/sigil/bld-ivy/test/config/proj1/newton-project.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<sigil:bundle xmlns:sigil="http://sigil.codecauldron.org/xml/sigil-namespace">
-<classpathEntry><classpathentry kind="lib" path="lib/dependee.jar"/></classpathEntry>
-<classpathEntry><classpathentry kind="src" path="src"/></classpathEntry>
-<bundle>
-<bundle-version>0.0.0</bundle-version>
-<bundle-vendor>Paremus Limited</bundle-vendor>
-<bundle-symbolicName>org.example.helloworld</bundle-symbolicName>
-<fragment-host bundle="com.springsource.org.apache.commons.lang" version="[2.0.0,2.4.0)"/>
-<export-package package="org.example.helloworld.api" version="0.0.0"/><import-package package="org.cauldron.newton.command" version="1.2.0"/><import-package package="org.apache.log4j" version="[1.2.14,1.3)"/><import-package package="org.example.helloworld.api" version="0"/><import-package package="org.cauldron.newton.command.console" version="1.2.0"/></bundle>
-<sigil:composite xmlns:sigil="http://sigil.codecauldron.org/xml/sigil-namespace">
-<location>sca/org.example.helloworld.service.composite</location>
-</sigil:composite>
-<sigil:composite xmlns:sigil="http://sigil.codecauldron.org/xml/sigil-namespace">
-<location>sca/org.example.helloworld.cli.composite</location>
-</sigil:composite>
-</sigil:bundle>
diff --git a/sigil/bld-ivy/test/dependence/dependee/build.xml b/sigil/bld-ivy/test/dependence/dependee/build.xml
index 925d95a..f35c2f9 100644
--- a/sigil/bld-ivy/test/dependence/dependee/build.xml
+++ b/sigil/bld-ivy/test/dependence/dependee/build.xml
@@ -50,7 +50,7 @@
<ivy:settings file="${ivy.settings.dir}/ivysettings.xml" />
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="org.apache.felix.sigil.ant.BundleTask"
classpath="${basedir}/../../../target/sigil-ivy-plugin.jar"/>
</target>
diff --git a/sigil/bld-ivy/test/dependence/settings/ivysettings.xml b/sigil/bld-ivy/test/dependence/settings/ivysettings.xml
index 9312a85..2127496 100644
--- a/sigil/bld-ivy/test/dependence/settings/ivysettings.xml
+++ b/sigil/bld-ivy/test/dependence/settings/ivysettings.xml
@@ -28,8 +28,8 @@
</caches>
<classpath file="${ivy.settings.dir}/../../../target/sigil-ivy-plugin.jar" />
- <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
- <typedef name="sigil" classname="org.cauldron.bld.ivy.SigilResolver" />
+ <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+ <typedef name="sigil" classname="org.apache.felix.sigil.ivy.SigilResolver" />
<parsers>
<sigil-parser/>
diff --git a/sigil/bld-ivy/test/multi-project/common/common.xml b/sigil/bld-ivy/test/multi-project/common/common.xml
index 4e54d1d..07883a2 100644
--- a/sigil/bld-ivy/test/multi-project/common/common.xml
+++ b/sigil/bld-ivy/test/multi-project/common/common.xml
@@ -76,7 +76,7 @@
classpath="${ivy.jar.file}"/>
<taskdef name="sigil.bundle"
- classname="org.cauldron.bld.ant.BundleTask"
+ classname="org.apache.felix.sigil.ant.BundleTask"
classpath="${sigil-ivy-plugin.jar}:${bndlib.jar}"/>
</target>
diff --git a/sigil/bld-ivy/test/multi-project/common/ivysettings.xml b/sigil/bld-ivy/test/multi-project/common/ivysettings.xml
index 03440c4..217bab5 100644
--- a/sigil/bld-ivy/test/multi-project/common/ivysettings.xml
+++ b/sigil/bld-ivy/test/multi-project/common/ivysettings.xml
@@ -36,8 +36,8 @@
Loading sigil-ivy-plugin.jar in ivy-taskdefs, uses the same ClassLoader
to load sigil-ivy-plugin, and thus avoids re-initialising ProjectRepositiory.
-->
- <typedef name="sigil-parser" classname="org.cauldron.bld.ivy.SigilParser" />
- <typedef name="sigil" classname="org.cauldron.bld.ivy.SigilResolver" />
+ <typedef name="sigil-parser" classname="org.apache.felix.sigil.ivy.SigilParser" />
+ <typedef name="sigil" classname="org.apache.felix.sigil.ivy.SigilResolver" />
<parsers>
<sigil-parser quiet="true"/>