From 2f95bc4704ce4e95b45dba43fccfdb61926619c1 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Mon, 28 May 2001 12:57:14 +0000 Subject: [PATCH] Started to fix some of the more ugly hacks that violated IOC. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269053 13f79535-47bb-0310-9956-ffa450edef68 --- .../core/AbstractResourceRegisterer.java | 14 +++++++-- .../ant/modules/core/RegisterConverter.java | 20 ++++++++----- .../ant/modules/core/RegisterDataType.java | 4 +-- .../ant/modules/core/RegisterTasklet.java | 2 +- .../ant/modules/core/RegisterTasklib.java | 10 +++---- .../tasklet/engine/DefaultTaskletEngine.java | 29 ------------------- .../ant/tasklet/engine/TaskletEngine.java | 26 ----------------- 7 files changed, 32 insertions(+), 73 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/core/AbstractResourceRegisterer.java b/proposal/myrmidon/src/java/org/apache/ant/modules/core/AbstractResourceRegisterer.java index be98119d2..65f0af028 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/core/AbstractResourceRegisterer.java +++ b/proposal/myrmidon/src/java/org/apache/ant/modules/core/AbstractResourceRegisterer.java @@ -12,7 +12,9 @@ import java.net.MalformedURLException; import java.net.URL; import org.apache.ant.AntException; import org.apache.myrmidon.api.AbstractTask; +import org.apache.ant.tasklet.engine.TskDeployer; import org.apache.ant.tasklet.engine.TaskletEngine; +import org.apache.ant.tasklet.engine.DataTypeEngine; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.Composable; @@ -30,13 +32,21 @@ public abstract class AbstractResourceRegisterer protected String m_lib; protected String m_name; protected String m_classname; - protected TaskletEngine m_engine; - + protected TskDeployer m_tskDeployer; + protected DataTypeEngine m_dataTypeEngine; + protected TaskletEngine m_engine; + public void compose( final ComponentManager componentManager ) throws ComponentException { m_engine = (TaskletEngine)componentManager. lookup( "org.apache.ant.tasklet.engine.TaskletEngine" ); + + m_tskDeployer = (TskDeployer)componentManager. + lookup( "org.apache.ant.tasklet.engine.TskDeployer" ); + + m_dataTypeEngine = (DataTypeEngine)componentManager. + lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" ); } public void setLib( final String lib ) 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 bdae660dc..d1e9f3b5c 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 @@ -14,7 +14,7 @@ import org.apache.ant.AntException; import org.apache.ant.convert.engine.ConverterEngine; import org.apache.ant.convert.engine.DefaultConverterInfo; import org.apache.myrmidon.api.AbstractTask; -import org.apache.ant.tasklet.engine.TaskletEngine; +import org.apache.ant.tasklet.engine.TskDeployer; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.Composable; @@ -35,13 +35,17 @@ public class RegisterConverter protected String m_destinationType; protected String m_lib; protected String m_classname; - protected TaskletEngine m_engine; - + protected TskDeployer m_tskDeployer; + protected ConverterEngine m_converterEngine; + public void compose( final ComponentManager componentManager ) throws ComponentException { - m_engine = (TaskletEngine)componentManager. - lookup( "org.apache.ant.tasklet.engine.TaskletEngine" ); + m_tskDeployer = (TskDeployer)componentManager. + lookup( "org.apache.ant.tasklet.engine.TskDeployer" ); + + m_converterEngine = (ConverterEngine)componentManager. + lookup( "org.apache.ant.convert.engine.ConverterEngine" ); } public void setLib( final String lib ) @@ -95,7 +99,7 @@ public class RegisterConverter { try { - m_engine.getTskDeployer().deployConverter( m_classname, url.toString(), url ); + m_tskDeployer.deployConverter( m_classname, url.toString(), url ); } catch( final DeploymentException de ) { @@ -111,8 +115,8 @@ public class RegisterConverter try { - m_engine.getConverterEngine().getInfoRegistry().register( m_classname, info ); - m_engine.getConverterEngine().getRegistry().register( m_classname, locator ); + m_converterEngine.getInfoRegistry().register( m_classname, info ); + m_converterEngine.getRegistry().register( m_classname, locator ); } catch( final RegistryException re ) { diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterDataType.java b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterDataType.java index e247e7583..357ff081a 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterDataType.java +++ b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterDataType.java @@ -28,7 +28,7 @@ public class RegisterDataType { if( null == classname ) { - try { m_engine.getTskDeployer().deployDataType( name, url.toString(), url ); } + try { m_tskDeployer.deployDataType( name, url.toString(), url ); } catch( final DeploymentException de ) { throw new AntException( "Failed deploying " + name + " from " + url, de ); @@ -37,7 +37,7 @@ public class RegisterDataType else { final DefaultLocator locator = new DefaultLocator( classname, url ); - m_engine.getDataTypeEngine().getRegistry().register( name, locator ); + m_dataTypeEngine.getRegistry().register( name, locator ); } } } diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklet.java b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklet.java index 48d2a1579..2692005b6 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklet.java +++ b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklet.java @@ -28,7 +28,7 @@ public class RegisterTasklet { if( null == classname ) { - try { m_engine.getTskDeployer().deployTasklet( name, url.toString(), url ); } + try { m_tskDeployer.deployTasklet( name, url.toString(), url ); } catch( final DeploymentException de ) { throw new AntException( "Failed deploying " + name + " from " + url, de ); diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklib.java b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklib.java index c1cd8088d..bd330cb0a 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklib.java +++ b/proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklib.java @@ -12,7 +12,7 @@ import java.net.MalformedURLException; import java.net.URL; import org.apache.ant.AntException; import org.apache.myrmidon.api.AbstractTask; -import org.apache.ant.tasklet.engine.TaskletEngine; +import org.apache.ant.tasklet.engine.TskDeployer; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.Composable; @@ -28,13 +28,13 @@ public class RegisterTasklib implements Composable { protected String m_lib; - protected TaskletEngine m_engine; + protected TskDeployer m_tskDeployer; public void compose( final ComponentManager componentManager ) throws ComponentException { - m_engine = (TaskletEngine)componentManager. - lookup( "org.apache.ant.tasklet.engine.TaskletEngine" ); + m_tskDeployer = (TskDeployer)componentManager. + lookup( "org.apache.ant.tasklet.engine.TskDeployer" ); } public void setLib( final String lib ) @@ -61,7 +61,7 @@ public class RegisterTasklib try { - m_engine.getTskDeployer().deploy( url.toString(), url ); + m_tskDeployer.deploy( url.toString(), url ); } catch( final DeploymentException de ) { 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 822184100..9f5f8cf9b 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 @@ -40,40 +40,17 @@ public class DefaultTaskletEngine extends AbstractLoggable implements TaskletEngine, Composable { - protected TskDeployer m_tskDeployer; protected Factory m_factory; protected Registry m_locatorRegistry = new DefaultRegistry( Locator.class ); protected Configurer m_configurer; - protected DataTypeEngine m_dataTypeEngine; - protected ConverterEngine m_converterEngine; protected ComponentManager m_componentManager; - public TskDeployer getTskDeployer() - { - return m_tskDeployer; - } - - public ConverterEngine getConverterEngine() - { - return m_converterEngine; - } - public Registry getRegistry() { return m_locatorRegistry; } - /** - * Retrieve datatype engine. - * - * @return the DataTypeEngine - */ - public DataTypeEngine getDataTypeEngine() - { - return m_dataTypeEngine; - } - /** * Retrieve relevent services needed to deploy. * @@ -87,14 +64,8 @@ public class DefaultTaskletEngine m_componentManager = componentManager; m_factory = (Factory)componentManager.lookup( "org.apache.avalon.framework.camelot.Factory" ); - m_tskDeployer = (TskDeployer)componentManager. - lookup( "org.apache.ant.tasklet.engine.TskDeployer" ); m_configurer = (Configurer)componentManager. lookup( "org.apache.myrmidon.components.configurer.Configurer" ); - m_dataTypeEngine = (DataTypeEngine)componentManager. - lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" ); - m_converterEngine = (ConverterEngine)componentManager. - lookup( "org.apache.ant.convert.engine.ConverterEngine" ); } public void execute( final Configuration taskData, final TaskContext context ) 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 fb30ea5a6..799047544 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 @@ -8,15 +8,10 @@ package org.apache.ant.tasklet.engine; import org.apache.ant.AntException; -import org.apache.ant.convert.engine.ConverterEngine; -import org.apache.ant.tasklet.engine.DataTypeEngine; import org.apache.myrmidon.api.TaskContext; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.component.Component; -import org.apache.avalon.framework.component.ComponentManager; -import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.camelot.Registry; -import org.apache.log.Logger; /** * Engine inteface that should be implemented by all tasklet engines. @@ -26,33 +21,12 @@ import org.apache.log.Logger; public interface TaskletEngine extends Component { - /** - * Retrieve deployer for engine. - * - * @return the deployer - */ - TskDeployer getTskDeployer(); - /** * Retrieve locator registry associated with engine. * * @return the LocatorRegistry */ Registry getRegistry(); - - /** - * Retrieve converter engine. - * - * @return the ConverterEngine - */ - ConverterEngine getConverterEngine(); - - /** - * Retrieve datatype engine. - * - * @return the DataTypeEngine - */ - DataTypeEngine getDataTypeEngine(); /** * execute a task.