diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToByteConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java index de6dcdb06..23724ca39 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToByteConverter.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.modules.basic; +package org.apache.myrmidon.libs.core; +import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; -import org.apache.avalon.framework.context.Context; /** * String to byte converter diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToClassConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java index 5505881fd..9db44f1ee 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToClassConverter.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.modules.basic; +package org.apache.myrmidon.libs.core; +import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; -import org.apache.avalon.framework.context.Context; /** * String to class converter diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToDoubleConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToDoubleConverter.java index b138111d4..ce392e185 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/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.ant.modules.basic; +package org.apache.myrmidon.libs.core; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFileConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFileConverter.java index cece72af5..ddcb3d766 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/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.ant.modules.basic; +package org.apache.myrmidon.libs.core; import java.io.File; import org.apache.avalon.framework.context.Context; diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFloatConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java index 28d444256..90f68e82f 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToFloatConverter.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.modules.basic; +package org.apache.myrmidon.libs.core; +import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; -import org.apache.avalon.framework.context.Context; /** * String to float converter diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToIntegerConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java index ef9193cbd..a84027083 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToIntegerConverter.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.modules.basic; +package org.apache.myrmidon.libs.core; +import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; import org.apache.myrmidon.converter.ConverterException; -import org.apache.avalon.framework.context.Context; /** * String to integer converter. diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToLongConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToLongConverter.java index 91370d59e..5d24994f5 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/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.ant.modules.basic; +package org.apache.myrmidon.libs.core; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToShortConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToShortConverter.java index ef707b4cc..17b706120 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/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.ant.modules.basic; +package org.apache.myrmidon.libs.core; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.converter.AbstractConverter; diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToURLConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/StringToURLConverter.java index 1f45f595f..9325cab23 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/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.ant.modules.basic; +package org.apache.myrmidon.libs.core; import java.net.MalformedURLException; import java.net.URL;