Moved Converter architecture into aut hierarchy as it is completely decoupled from rest of ant

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

proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to boolean converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to byte converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to class converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to double converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java

@@ -13,8 +13,8 @@ import java.util.Arrays;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.Converter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to Enum converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java

@@ -12,8 +12,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to file converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to float converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to integer converter.

proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to long converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java

@@ -10,8 +10,8 @@ package org.apache.antlib.core;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to short converter

proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java

@@ -12,8 +12,8 @@ import java.net.URL;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * String to url converter

proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java

@@ -13,8 +13,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.context.Context;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 
 /**
  * Converts a String to a {@link FileObject}

proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java → proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.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.myrmidon.converter;
+package org.apache.aut.converter;
 
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
@@ -49,7 +49,7 @@ public abstract class AbstractConverter
     public Object convert( final Class destination,
                            final Object original,
                            final Object context )
-        throws ConverterException
+        throws org.apache.aut.converter.ConverterException
     {
         if( m_destination != destination )
         {
@@ -74,9 +74,9 @@ public abstract class AbstractConverter
      * @param original the original Object
      * @param context the context in which to convert
      * @return the converted object
-     * @exception ConverterException if an error occurs
+     * @exception org.apache.aut.converter.ConverterException if an error occurs
      */
     protected abstract Object convert( Object original, Object context )
-        throws ConverterException;
+        throws org.apache.aut.converter.ConverterException;
 }
 

proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java → proposal/myrmidon/src/java/org/apache/aut/converter/Converter.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.myrmidon.converter;
+package org.apache.aut.converter;
 
 /**
  * Instances of this interface are used to convert between different types.

proposal/myrmidon/src/java/org/apache/myrmidon/converter/ConverterException.java → proposal/myrmidon/src/java/org/apache/aut/converter/ConverterException.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.myrmidon.converter;
+package org.apache.aut.converter;
 
 import org.apache.avalon.framework.CascadingException;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java

@@ -21,7 +21,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.logger.LogEnabled;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.ConverterException;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java

@@ -14,8 +14,8 @@ import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.Converter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;
 import org.apache.myrmidon.interfaces.type.TypeException;

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java

@@ -17,7 +17,7 @@ import org.apache.avalon.framework.component.ComponentException;
 import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.Converter;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.deployer.ConverterDefinition;
 import org.apache.myrmidon.interfaces.deployer.Deployer;

proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java

@@ -14,8 +14,8 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.Converter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;
 import org.apache.myrmidon.interfaces.executor.Executor;

proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java

@@ -8,7 +8,7 @@
 package org.apache.myrmidon.interfaces.converter;
 
 import org.apache.avalon.framework.component.Component;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.Converter;
 
 /**
  * Master Converter to handle converting between types.

proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.types.converters;
 
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.tools.ant.types.Path;
 
 /**

proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java

@@ -28,7 +28,7 @@ import org.apache.myrmidon.components.extensions.DefaultExtensionManager;
 import org.apache.myrmidon.components.role.DefaultRoleManager;
 import org.apache.myrmidon.components.service.DefaultServiceManager;
 import org.apache.myrmidon.components.type.DefaultTypeManager;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.Converter;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;

proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java

@@ -7,8 +7,8 @@
  */
 package org.apache.myrmidon.components.configurer;
 
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.avalon.framework.context.Context;
 
 /**

proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java

@@ -18,8 +18,8 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
 import org.apache.myrmidon.interfaces.type.TypeFactory;
 import org.apache.myrmidon.interfaces.type.TypeManager;
 import org.apache.myrmidon.interfaces.type.TypeException;
-import org.apache.myrmidon.converter.ConverterException;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.ConverterException;
+import org.apache.aut.converter.Converter;
 import java.io.File;
 
 /**

proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java

@@ -7,8 +7,8 @@
  */
 package org.apache.myrmidon.components.deployer;
 
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.Converter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.avalon.framework.context.Context;
 
 /**

proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java

@@ -28,7 +28,7 @@ import org.apache.myrmidon.components.extensions.DefaultExtensionManager;
 import org.apache.myrmidon.components.role.DefaultRoleManager;
 import org.apache.myrmidon.components.service.DefaultServiceManager;
 import org.apache.myrmidon.components.type.DefaultTypeManager;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.Converter;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;

proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java

@@ -7,8 +7,8 @@
  */
 package org.apache.myrmidon.components.configurer;
 
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.avalon.framework.context.Context;
 
 /**

proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java

@@ -18,8 +18,8 @@ import org.apache.myrmidon.interfaces.role.RoleManager;
 import org.apache.myrmidon.interfaces.type.TypeFactory;
 import org.apache.myrmidon.interfaces.type.TypeManager;
 import org.apache.myrmidon.interfaces.type.TypeException;
-import org.apache.myrmidon.converter.ConverterException;
-import org.apache.myrmidon.converter.Converter;
+import org.apache.aut.converter.ConverterException;
+import org.apache.aut.converter.Converter;
 import java.io.File;
 
 /**

proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java

@@ -7,8 +7,8 @@
  */
 package org.apache.myrmidon.components.deployer;
 
-import org.apache.myrmidon.converter.Converter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.Converter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.avalon.framework.context.Context;
 
 /**

proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.types.converters;
 
 import org.apache.avalon.framework.context.Context;
-import org.apache.myrmidon.converter.AbstractConverter;
-import org.apache.myrmidon.converter.ConverterException;
+import org.apache.aut.converter.AbstractConverter;
+import org.apache.aut.converter.ConverterException;
 import org.apache.tools.ant.types.Path;
 
 /**