You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2001/06/02 10:40:10 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor DefaultExecutor.java Executor.java
donaldp 01/06/02 01:40:10
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultTskDeployer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
MyrmidonEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
DefaultExecutor.java Executor.java
Removed: proposal/myrmidon/src/java/org/apache/ant/tasklet/engine
DataTypeEngine.java DefaultDataTypeEngine.java
Log:
Removed DataTypeEngine as it is supersceded by TypeManager.
Remove the ugly hacks in Executor when it returned own registry (broke IOC). This no longer needed due to TypeManager
Revision Changes Path
1.6 +0 -1 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultTskDeployer.java
Index: DefaultTskDeployer.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultTskDeployer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultTskDeployer.java 2001/06/02 08:26:53 1.5
+++ DefaultTskDeployer.java 2001/06/02 08:40:10 1.6
@@ -18,7 +18,6 @@
import org.apache.ant.convert.engine.ConverterEngine;
import org.apache.ant.convert.engine.ConverterRegistry;
import org.apache.ant.convert.engine.DefaultConverterInfo;
-import org.apache.ant.tasklet.engine.DataTypeEngine;
import org.apache.avalon.framework.camelot.AbstractDeployer;
import org.apache.avalon.framework.camelot.DefaultLocator;
import org.apache.avalon.framework.camelot.DefaultRegistry;
1.14 +0 -10 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java
Index: MyrmidonEmbeddor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MyrmidonEmbeddor.java 2001/06/02 08:26:54 1.13
+++ MyrmidonEmbeddor.java 2001/06/02 08:40:10 1.14
@@ -9,7 +9,6 @@
import java.io.File;
import org.apache.ant.convert.engine.ConverterEngine;
-import org.apache.ant.tasklet.engine.DataTypeEngine;
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.camelot.CamelotUtil;
@@ -44,7 +43,6 @@
private ProjectBuilder m_builder;
private TskDeployer m_deployer;
- private DataTypeEngine m_dataTypeEngine;
private TypeManager m_typeManager;
private ConverterEngine m_converterEngine;
@@ -139,7 +137,6 @@
throws Exception
{
m_converterEngine = null;
- m_dataTypeEngine = null;
m_executor = null;
m_projectManager = null;
m_builder = null;
@@ -172,8 +169,6 @@
//create all the default properties for components
defaults.setParameter( "org.apache.ant.convert.engine.ConverterEngine",
"org.apache.ant.convert.engine.DefaultConverterEngine" );
- defaults.setParameter( "org.apache.ant.tasklet.engine.DataTypeEngine",
- "org.apache.ant.tasklet.engine.DefaultDataTypeEngine" );
defaults.setParameter( TypeManager.ROLE,
"org.apache.myrmidon.components.type.DefaultTypeManager" );
@@ -203,7 +198,6 @@
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.avalon.framework.camelot.Factory", m_factory );
//Following components required when Myrmidon is used as build tool
@@ -239,9 +233,6 @@
component = getParameter( Configurer.ROLE );
m_configurer = (Configurer)createComponent( component, Configurer.class );
- component = getParameter( "org.apache.ant.tasklet.engine.DataTypeEngine" );
- m_dataTypeEngine = (DataTypeEngine)createComponent( component, DataTypeEngine.class );
-
component = getParameter( TypeManager.ROLE );
m_typeManager = (TypeManager)createComponent( component, TypeManager.class );
@@ -268,7 +259,6 @@
{
setupComponent( m_factory );
setupComponent( m_converterEngine );
- setupComponent( m_dataTypeEngine );
setupComponent( m_executor );
setupComponent( m_projectManager );
setupComponent( m_builder );
1.6 +0 -22 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultExecutor.java 2001/06/02 08:26:54 1.5
+++ DefaultExecutor.java 2001/06/02 08:40:10 1.6
@@ -10,13 +10,6 @@
import org.apache.ant.convert.engine.ConverterEngine;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.camelot.DefaultFactory;
-import org.apache.avalon.framework.camelot.DefaultRegistry;
-import org.apache.avalon.framework.camelot.Factory;
-import org.apache.avalon.framework.camelot.FactoryException;
-import org.apache.avalon.framework.camelot.Locator;
-import org.apache.avalon.framework.camelot.Registry;
-import org.apache.avalon.framework.camelot.RegistryException;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -41,18 +34,11 @@
extends AbstractLoggable
implements Executor, Composable
{
- //private Factory m_factory;
- //private Registry m_registry = new DefaultRegistry( Locator.class );
private Configurer m_configurer;
private ComponentSelector m_selector;
private ComponentManager m_componentManager;
- public Registry getRegistry()
- {
- return null;//m_registry;
- }
-
/**
* Retrieve relevent services needed to deploy.
*
@@ -105,19 +91,11 @@
try
{
return (Task)m_selector.select( name );
- //final Locator locator = (Locator)m_registry.getInfo( name, Locator.class );
- //return (Task)m_factory.create( locator, Task.class );
}
catch( final ComponentException ce )
{
throw new TaskException( "Unable to create task " + name, ce );
}
-/* catch( final RegistryException re )
- {
- throw new TaskException( "Unable to locate task " + name, re );
- }
- catch( final FactoryException fe )
-*/
}
private void doConfigure( final Task task,
1.5 +0 -9 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java
Index: Executor.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Executor.java 2001/05/31 17:20:16 1.4
+++ Executor.java 2001/06/02 08:40:10 1.5
@@ -7,7 +7,6 @@
*/
package org.apache.myrmidon.components.executor;
-import org.apache.avalon.framework.camelot.Registry;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.myrmidon.api.TaskContext;
@@ -22,14 +21,6 @@
extends Component
{
String ROLE = "org.apache.myrmidon.components.executor.Executor";
-
- /**
- * Retrieve locator registry associated with engine.
- * TODO: Remove this as it violates IOC
- *
- * @return the LocatorRegistry
- */
- Registry getRegistry();
/**
* execute a task.