Move the primitive, reusable and non-myrmidon specific converters into the aut hierarchy

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271978 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/aut/converter/AbstractMasterConverter.java

@@ -35,7 +35,7 @@ import org.apache.myrmidon.components.converter.DefaultMasterConverter;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  * @version $Revision$ $Date$
  */
-public class AbstractMasterConverter
+public abstract class AbstractMasterConverter
     implements Converter
 {
     private final static Resources REZ =

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.

proposal/myrmidon/src/java/org/apache/antlib/core/ObjectToStringConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java → 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;
 

proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java → 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;

proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java → 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;

proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties

@@ -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.

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;

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;