From 22fc4ce3cb5f71292ec61230ddae8eca3e1d77f6 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 7 Feb 2001 06:49:43 +0000 Subject: [PATCH] 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 --- .../src/java/org/apache/ant/DefaultAntEngine.java | 7 ++++--- .../apache/ant/convert/{ => engine}/ConverterEngine.java | 3 ++- .../apache/ant/convert/{ => engine}/ConverterInfo.java | 2 +- .../ant/convert/{ => engine}/ConverterRegistry.java | 3 ++- .../ant/convert/{ => engine}/DefaultConverterEngine.java | 4 +++- .../ant/convert/{ => engine}/DefaultConverterInfo.java | 2 +- .../convert/{ => engine}/DefaultConverterRegistry.java | 2 +- .../org/apache/ant/modules/core/RegisterConverter.java | 4 ++-- .../apache/ant/tasklet/engine/DefaultTaskletEngine.java | 7 +++---- .../org/apache/ant/tasklet/engine/DefaultTskDeployer.java | 8 ++++---- .../java/org/apache/ant/tasklet/engine/TaskletEngine.java | 2 +- 11 files changed, 24 insertions(+), 20 deletions(-) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/ConverterEngine.java (91%) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/ConverterInfo.java (95%) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/ConverterRegistry.java (95%) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/DefaultConverterEngine.java (96%) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/DefaultConverterInfo.java (96%) rename proposal/myrmidon/src/java/org/apache/ant/convert/{ => engine}/DefaultConverterRegistry.java (98%) diff --git a/proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java b/proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java index 41f35ac8b..cd41fe2d7 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java +++ b/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 ); diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEngine.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterEngine.java similarity index 91% rename from proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEngine.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterEngine.java index 6408a2c83..11337a707 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEngine.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterInfo.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterInfo.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/ant/convert/ConverterInfo.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterInfo.java index 61c4cbe06..d69dc3c93 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterInfo.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterRegistry.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterRegistry.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/ant/convert/ConverterRegistry.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/ConverterRegistry.java index 2347dea1d..d0478be4a 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterRegistry.java +++ b/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. * diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterEngine.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterEngine.java index ceefcedcb..7845fa0f4 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterInfo.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterInfo.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterInfo.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterInfo.java index 79640c829..2f793b270 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterInfo.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterRegistry.java b/proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterRegistry.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterRegistry.java rename to proposal/myrmidon/src/java/org/apache/ant/convert/engine/DefaultConverterRegistry.java index e47162cae..99c87c674 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterRegistry.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterConverter.java b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterConverter.java index 9cfbe8254..08e6888e8 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterConverter.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java index cfcad0242..ed144154c 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java +++ b/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" ); diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java index 58eac0a16..12a21542f 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java +++ b/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(); diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java index a64ac9095..558f031d7 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java +++ b/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;