diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java index ef72b65a4..682b203fb 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java index 21779b6aa..69da3ad6b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java index fcfc7621d..f3c296987 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java index 5dba59ff2..4a4154538 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java index 49e9d52ec..a4ce87bef 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java index 374c15d43..6d87aacf4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java index eda27ac62..4403611a8 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java index 21a81fc92..170fc1cd6 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java index 600016dc3..1b7a9f887 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java index 2563d27ba..ba6932b82 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java index ee5b87dc7..0856ba171 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java index b2dbdf769..30bea473d 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java +++ b/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} diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java similarity index 91% rename from proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/AbstractConverter.java index 00f88629d..a915bbc77 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java +++ b/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; } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java b/proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/Converter.java index 91cc29d80..f4a621206 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/ConverterException.java b/proposal/myrmidon/src/java/org/apache/aut/converter/ConverterException.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/myrmidon/converter/ConverterException.java rename to proposal/myrmidon/src/java/org/apache/aut/converter/ConverterException.java index 76506a359..e483cfbeb 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/ConverterException.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Resources.properties b/proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties similarity index 100% rename from proposal/myrmidon/src/java/org/apache/myrmidon/converter/Resources.properties rename to proposal/myrmidon/src/java/org/apache/aut/converter/Resources.properties diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java index ceaf0259b..0adbbeb3f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java index d5f81fab1..0b178ce88 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java index 09d4c24aa..72350d456 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java index 985fdd16b..307a8380c 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java index 88650d26f..ca72f0c1f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java index 9cc9d505f..b7aaf9869 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java +++ b/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; /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java index b89ab71aa..5d3f77018 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/AbstractComponentTest.java +++ b/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; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java index 1ce758f1e..dbeac97aa 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java +++ b/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; /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 44372f971..4ceccb4aa 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/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; /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java index 57d250c01..07c0d9f20 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/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; /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java index b89ab71aa..5d3f77018 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/AbstractComponentTest.java +++ b/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; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java index 1ce758f1e..dbeac97aa 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java +++ b/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; /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java index 44372f971..4ceccb4aa 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/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; /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java index 57d250c01..07c0d9f20 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/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; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java index 9cc9d505f..b7aaf9869 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java +++ b/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; /**