In the future a better abstraction should be found. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269872 13f79535-47bb-0310-9956-ffa450edef68master
@@ -25,7 +25,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException; | |||||
import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | import org.apache.avalon.framework.configuration.SAXConfigurationHandler; | ||||
import org.apache.avalon.framework.logger.AbstractLoggable; | import org.apache.avalon.framework.logger.AbstractLoggable; | ||||
import org.apache.myrmidon.api.Task; | import org.apache.myrmidon.api.Task; | ||||
import org.apache.myrmidon.components.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.converter.Converter; | import org.apache.myrmidon.converter.Converter; | ||||
import org.apache.myrmidon.interfaces.converter.ConverterRegistry; | import org.apache.myrmidon.interfaces.converter.ConverterRegistry; | ||||
import org.apache.myrmidon.interfaces.deployer.Deployer; | import org.apache.myrmidon.interfaces.deployer.Deployer; | ||||
@@ -5,15 +5,15 @@ | |||||
* version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
* the LICENSE file. | * the LICENSE file. | ||||
*/ | */ | ||||
package org.apache.myrmidon.components.type; | |||||
package org.apache.myrmidon.interfaces.type; | |||||
import java.net.URL; | import java.net.URL; | ||||
import java.util.HashMap; | |||||
import java.net.URLClassLoader; | import java.net.URLClassLoader; | ||||
import java.util.HashMap; | |||||
import org.apache.avalon.excalibur.i18n.ResourceManager; | import org.apache.avalon.excalibur.i18n.ResourceManager; | ||||
import org.apache.avalon.excalibur.i18n.Resources; | import org.apache.avalon.excalibur.i18n.Resources; | ||||
import org.apache.myrmidon.interfaces.type.TypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.TypeException; | import org.apache.myrmidon.interfaces.type.TypeException; | ||||
import org.apache.myrmidon.interfaces.type.TypeFactory; | |||||
/** | /** | ||||
* Create a type instance based on name. | * Create a type instance based on name. | ||||
@@ -99,7 +99,7 @@ public class DefaultTypeFactory | |||||
final String message = REZ.getString( "no-mapping.error", name ); | final String message = REZ.getString( "no-mapping.error", name ); | ||||
throw new TypeException( message ); | throw new TypeException( message ); | ||||
} | } | ||||
return className; | return className; | ||||
} | } | ||||
@@ -109,7 +109,7 @@ public class DefaultTypeFactory | |||||
{ | { | ||||
m_classLoader = new URLClassLoader( m_urls, m_parent ); | m_classLoader = new URLClassLoader( m_urls, m_parent ); | ||||
} | } | ||||
return m_classLoader; | return m_classLoader; | ||||
} | } | ||||
} | } |
@@ -8,7 +8,7 @@ | |||||
package org.apache.myrmidon.libs.ant1; | package org.apache.myrmidon.libs.ant1; | ||||
import java.net.URL; | import java.net.URL; | ||||
import org.apache.myrmidon.components.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.TypeException; | import org.apache.myrmidon.interfaces.type.TypeException; | ||||
import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
@@ -18,7 +18,7 @@ import org.apache.avalon.framework.component.Composable; | |||||
import org.apache.myrmidon.api.AbstractTask; | import org.apache.myrmidon.api.AbstractTask; | ||||
import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
import org.apache.myrmidon.interfaces.converter.ConverterRegistry; | import org.apache.myrmidon.interfaces.converter.ConverterRegistry; | ||||
import org.apache.myrmidon.components.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; | |||||
import org.apache.myrmidon.interfaces.type.TypeManager; | import org.apache.myrmidon.interfaces.type.TypeManager; | ||||
import org.apache.myrmidon.converter.Converter; | import org.apache.myrmidon.converter.Converter; | ||||