From 7f5a9ddff29645bcae07023c549983257cbfad86 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 16 Dec 2001 11:56:46 +0000 Subject: [PATCH] Move core ant library into new package hierarchy git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270226 13f79535-47bb-0310-9956-ffa450edef68 --- .../{myrmidon/libs => antlib}/core/Echo.java | 2 +- .../libs => antlib}/core/Property.java | 2 +- .../libs => antlib}/core/Resources.properties | 0 .../core/StringToByteConverter.java | 2 +- .../core/StringToClassConverter.java | 2 +- .../core/StringToDoubleConverter.java | 2 +- .../core/StringToFileConverter.java | 2 +- .../core/StringToFloatConverter.java | 2 +- .../core/StringToIntegerConverter.java | 2 +- .../core/StringToLongConverter.java | 2 +- .../core/StringToShortConverter.java | 2 +- .../core/StringToURLConverter.java | 2 +- .../src/manifest/core-ant-descriptor.xml | 40 +++++++++---------- 13 files changed, 31 insertions(+), 31 deletions(-) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/Echo.java (95%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/Property.java (99%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/Resources.properties (100%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToByteConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToClassConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToDoubleConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToFileConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToFloatConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToIntegerConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToLongConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToShortConverter.java (97%) rename proposal/myrmidon/src/java/org/apache/{myrmidon/libs => antlib}/core/StringToURLConverter.java (97%) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Echo.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/Echo.java index 1f191cab1..2da31ae51 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Echo.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Echo.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java similarity index 99% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/Property.java index 9a4da1af4..368d5a01c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/Property.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties b/proposal/myrmidon/src/java/org/apache/antlib/core/Resources.properties similarity index 100% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Resources.properties rename to proposal/myrmidon/src/java/org/apache/antlib/core/Resources.properties diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java index 27442b1bb..d85a066a1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java index 21c2e209a..dcaa795bb 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java index 133b199c9..257909401 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java index ac9101fc0..961951dcf 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import java.io.File; import org.apache.avalon.excalibur.i18n.ResourceManager; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java index 68f7a8b27..896e74073 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java index 8a381aadf..cf2ef9912 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java index a2cda440b..c9c344274 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java index 46f8b5f3d..6d805b411 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java rename to proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java index a4c284154..1a1822858 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.myrmidon.libs.core; +package org.apache.antlib.core; import java.net.MalformedURLException; import java.net.URL; diff --git a/proposal/myrmidon/src/manifest/core-ant-descriptor.xml b/proposal/myrmidon/src/manifest/core-ant-descriptor.xml index 4f34ebef6..374f3c01b 100644 --- a/proposal/myrmidon/src/manifest/core-ant-descriptor.xml +++ b/proposal/myrmidon/src/manifest/core-ant-descriptor.xml @@ -1,5 +1,5 @@ - + @@ -7,35 +7,35 @@ - + - - - - - - - - -