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"/>