diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java index f16b4ab0d..bfc52063f 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java @@ -35,7 +35,7 @@ import org.apache.myrmidon.components.converter.DefaultMasterConverter; * @author Peter Donald * @version $Revision$ $Date$ */ -public class AbstractMasterConverter +public abstract class AbstractMasterConverter implements Converter { private final static Resources REZ = diff --git a/proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties b/proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties index d912151b4..d8b7f0a1f 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties @@ -1,2 +1,8 @@ bad-destination.error=Destination type ({0}) is not equal to {1}. bad-instance.error=Object {0} is not an instance of {1}. + +#AbstractMasterConverter +convert.error=Could not convert from {0} to {1}. +no-converter.error=Could not find an appropriate converter. +bad-return-type.error=Converter {0} returned an object of type {1} which is assignable to the expected type {2}. +ambiguous-converter.error=More than one converter available for this conversion. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/ObjectToStringConverter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/ObjectToStringConverter.java index 4af5ef476..f9231552f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/ObjectToStringConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java index cc677e71c..a837fafc4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToBooleanConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java index 3afc659bd..c66722db1 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToByteConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java index 4e2cc9e32..436192fc7 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToClassConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java index e2138fbf3..a648014d6 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToDoubleConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFileConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFileConverter.java index 4643d07f9..389c69064 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFileConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import java.io.File; import org.apache.aut.converter.AbstractConverter; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java index ab96e70e7..71659d7f3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToFloatConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java similarity index 93% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java index 257e4a1f8..f4d3b75e2 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToIntegerConverter.java @@ -5,10 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; +import org.apache.aut.converter.lib.StringToFloatConverter; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java index 7219387f6..72d76c85e 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToLongConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java index 4267b7c63..9b81ecfb9 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToShortConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java index b46a86a3e..17e13104a 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/aut/converter/lib/StringToURLConverter.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.aut.converter.lib; import java.net.MalformedURLException; import java.net.URL; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties deleted file mode 100644 index b52286df4..000000000 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties +++ /dev/null @@ -1,4 +0,0 @@ -convert.error=Could not convert from {0} to {1}. -no-converter.error=Could not find an appropriate converter. -bad-return-type.error=Converter {0} returned an object of type {1} which is assignable to the expected type {2}. -ambiguous-converter.error=More than one converter available for this conversion. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java index b14a85966..bf723f5aa 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java @@ -8,7 +8,7 @@ package org.apache.myrmidon.components.configurer.test; import java.io.File; -import org.apache.antlib.core.StringToIntegerConverter; +import org.apache.aut.converter.lib.StringToIntegerConverter; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.configuration.ConfigurationException; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java index ad00470b6..ec2039ff5 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java @@ -9,7 +9,7 @@ package org.apache.myrmidon.components.property.test; import java.io.File; import java.util.Date; -import org.apache.antlib.core.ObjectToStringConverter; +import org.apache.aut.converter.lib.ObjectToStringConverter; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException;