Rearranged convert package with separation of client-engine code

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

proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java

@@ -10,7 +10,7 @@ package org.apache.ant;
 import java.io.File;
 import java.util.Properties;
 import org.apache.ant.configuration.Configurer;
-import org.apache.ant.convert.ConverterEngine;
+import org.apache.ant.convert.engine.ConverterEngine;
 import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
@@ -158,7 +158,7 @@ public class DefaultAntEngine
 
         //create all the default properties for components
         defaults.setProperty( "ant.comp.converter",
-                              "org.apache.ant.convert.DefaultConverterEngine" );
+                              "org.apache.ant.convert.engine.DefaultConverterEngine" );
         defaults.setProperty( "ant.comp.datatype",
                               "org.apache.ant.tasklet.engine.DefaultDataTypeEngine" );
         defaults.setProperty( "ant.comp.tasklet",
@@ -186,7 +186,8 @@ public class DefaultAntEngine
 
         componentManager.put( "org.apache.ant.tasklet.engine.TaskletEngine", m_taskletEngine );
         componentManager.put( "org.apache.ant.project.ProjectEngine", m_projectEngine );
-        componentManager.put( "org.apache.ant.convert.ConverterEngine", m_converterEngine );
+        componentManager.put( "org.apache.ant.convert.engine.ConverterEngine", 
+                              m_converterEngine );
         componentManager.put( "org.apache.ant.convert.Converter", m_converterEngine );
         componentManager.put( "org.apache.ant.tasklet.engine.DataTypeEngine", m_dataTypeEngine );
         componentManager.put( "org.apache.ant.project.ProjectBuilder", m_builder );

proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEngine.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterEngine.java

@@ -5,8 +5,9 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
+import org.apache.ant.convert.Converter;
 import org.apache.avalon.Component;
 import org.apache.avalon.camelot.LocatorRegistry;
 

proposal/myrmidon/src/java/org/apache/ant/convert/ConverterInfo.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterInfo.java

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
 import org.apache.avalon.camelot.Info;
 

proposal/myrmidon/src/java/org/apache/ant/convert/ConverterRegistry.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterRegistry.java

@@ -5,9 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
 import org.apache.avalon.camelot.Registry;
+
 /**
  * Interface for registry for ConverterInfos.
  *

proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterEngine.java

@@ -5,9 +5,11 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
 import org.apache.ant.AntException;
+import org.apache.ant.convert.Converter;
+import org.apache.ant.convert.ConverterException;
 import org.apache.avalon.AbstractLoggable;
 import org.apache.avalon.ComponentManager;
 import org.apache.avalon.ComponentManagerException;

proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterInfo.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterInfo.java

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
 /**
  * This info represents meta-information about a converter.

proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterRegistry.java → proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterRegistry.java

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.convert;
+package org.apache.ant.convert.engine;
 
 import java.util.HashMap;
 import org.apache.avalon.camelot.DefaultRegistry;

proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterConverter.java

@@ -11,8 +11,8 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import org.apache.ant.AntException;
-import org.apache.ant.convert.ConverterEngine;
-import org.apache.ant.convert.DefaultConverterInfo;
+import org.apache.ant.convert.engine.ConverterEngine;
+import org.apache.ant.convert.engine.DefaultConverterInfo;
 import org.apache.ant.tasklet.AbstractTasklet;
 import org.apache.ant.tasklet.engine.TaskletEngine;
 import org.apache.avalon.ComponentManager;

proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java

@@ -13,7 +13,7 @@ import org.apache.ant.configuration.Configurable;
 import org.apache.ant.configuration.Configuration;
 import org.apache.ant.configuration.Configurer;
 import org.apache.ant.configuration.DefaultConfigurer;
-import org.apache.ant.convert.ConverterEngine;
+import org.apache.ant.convert.engine.ConverterEngine;
 import org.apache.ant.tasklet.Tasklet;
 import org.apache.ant.tasklet.TaskletContext;
 import org.apache.avalon.AbstractLoggable;
@@ -95,11 +95,10 @@ public class DefaultTaskletEngine
         m_dataTypeEngine = (DataTypeEngine)componentManager.
             lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" );
         m_converterEngine = (ConverterEngine)componentManager.
-            lookup( "org.apache.ant.convert.ConverterEngine" );
+            lookup( "org.apache.ant.convert.engine.ConverterEngine" );
     }
 
-    public void execute( final Configuration task, 
-                         final TaskletContext context )
+    public void execute( final Configuration task, final TaskletContext context )
         throws AntException
     {
         getLogger().debug( "Creating" );

proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java

@@ -15,9 +15,9 @@ import java.util.Iterator;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
-import org.apache.ant.convert.ConverterEngine;
-import org.apache.ant.convert.ConverterRegistry;
-import org.apache.ant.convert.DefaultConverterInfo;
+import org.apache.ant.convert.engine.ConverterEngine;
+import org.apache.ant.convert.engine.ConverterRegistry;
+import org.apache.ant.convert.engine.DefaultConverterInfo;
 import org.apache.avalon.Component;
 import org.apache.avalon.ComponentManager;
 import org.apache.avalon.ComponentManagerException;
@@ -75,7 +75,7 @@ public class DefaultTskDeployer
         m_taskletRegistry = taskletEngine.getRegistry();
 
         final ConverterEngine converterEngine = (ConverterEngine)componentManager.
-            lookup( "org.apache.ant.convert.ConverterEngine" );
+            lookup( "org.apache.ant.convert.engine.ConverterEngine" );
 
         m_converterInfoRegistry = converterEngine.getInfoRegistry();
         m_converterRegistry = converterEngine.getRegistry();

proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java

@@ -9,7 +9,7 @@ package org.apache.ant.tasklet.engine;
 
 import org.apache.ant.AntException;
 import org.apache.ant.configuration.Configuration;
-import org.apache.ant.convert.ConverterEngine;
+import org.apache.ant.convert.engine.ConverterEngine;
 import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.tasklet.TaskletContext;
 import org.apache.avalon.Component;