From e655a9fbe6f9e2307841106e127efb3559c0743c Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Tue, 6 Nov 2001 08:04:40 +0000
Subject: [PATCH] Move DefaultTypeFactory into interfaces hierarchy as it is
 used in many tasks. 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-ffa450edef68
---
 .../myrmidon/components/deployer/DefaultDeployer.java  |  2 +-
 .../type/DefaultTypeFactory.java                       | 10 +++++-----
 .../org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java |  2 +-
 .../org/apache/myrmidon/libs/runtime/ConverterDef.java |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename proposal/myrmidon/src/java/org/apache/myrmidon/{components => interfaces}/type/DefaultTypeFactory.java (98%)

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 c749490e6..1d3abf9f6 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
@@ -25,7 +25,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
 import org.apache.avalon.framework.logger.AbstractLoggable;
 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.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.deployer.Deployer;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
similarity index 98%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
index 217af4c50..86d9bcfe7 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/DefaultTypeFactory.java
@@ -5,15 +5,15 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.myrmidon.components.type;
+package org.apache.myrmidon.interfaces.type;
 
 import java.net.URL;
-import java.util.HashMap;
 import java.net.URLClassLoader;
+import java.util.HashMap;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 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.TypeFactory;
 
 /**
  * Create a type instance based on name.
@@ -99,7 +99,7 @@ public class DefaultTypeFactory
             final String message = REZ.getString( "no-mapping.error", name );
             throw new TypeException( message );
         }
-        
+
         return className;
     }
 
@@ -109,7 +109,7 @@ public class DefaultTypeFactory
         {
             m_classLoader = new URLClassLoader( m_urls, m_parent );
         }
-        
+
         return m_classLoader;
     }
 }
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
index 422f40162..a2ad078f1 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
@@ -8,7 +8,7 @@
 package org.apache.myrmidon.libs.ant1;
 
 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.tools.ant.Task;
 
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
index 6a0277a50..46709c846 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
@@ -18,7 +18,7 @@ import org.apache.avalon.framework.component.Composable;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 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.converter.Converter;