donaldp 01/02/06 21:38:32
Modified: proposal/myrmidon/src/java/org/apache/ant/tasklet/engine
DefaultTaskletEngine.java DefaultTskDeployer.java
TaskletEngine.java
Log:
Updated to reflect new packaging
Revision Changes Path
1.9 +8 -9
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java
Index: DefaultTaskletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultTaskletEngine.java 2001/01/08 04:36:46 1.8
+++ DefaultTaskletEngine.java 2001/02/07 05:38:29 1.9
@@ -14,7 +14,6 @@
import org.apache.ant.configuration.Configurer;
import org.apache.ant.configuration.DefaultConfigurer;
import org.apache.ant.convert.ConverterEngine;
-import org.apache.ant.datatypes.DataTypeEngine;
import org.apache.ant.tasklet.Tasklet;
import org.apache.ant.tasklet.TaskletContext;
import org.apache.avalon.AbstractLoggable;
@@ -89,14 +88,14 @@
m_componentManager = componentManager;
m_factory = (Factory)componentManager.lookup(
"org.apache.avalon.camelot.Factory" );
- m_tskDeployer =
- (TskDeployer)componentManager.lookup(
"org.apache.ant.tasklet.engine.TskDeployer" );
- m_configurer =
- (Configurer)componentManager.lookup(
"org.apache.ant.configuration.Configurer" );
- m_dataTypeEngine =
- (DataTypeEngine)componentManager.lookup(
"org.apache.ant.datatypes.DataTypeEngine" );
- m_converterEngine =
- (ConverterEngine)componentManager.lookup(
"org.apache.ant.convert.ConverterEngine" );
+ m_tskDeployer = (TskDeployer)componentManager.
+ lookup( "org.apache.ant.tasklet.engine.TskDeployer" );
+ m_configurer = (Configurer)componentManager.
+ lookup( "org.apache.ant.configuration.Configurer" );
+ m_dataTypeEngine = (DataTypeEngine)componentManager.
+ lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" );
+ m_converterEngine = (ConverterEngine)componentManager.
+ lookup( "org.apache.ant.convert.ConverterEngine" );
}
public void execute( final Configuration task,
1.6 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java
Index: DefaultTskDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultTskDeployer.java 2001/01/08 04:36:46 1.5
+++ DefaultTskDeployer.java 2001/02/07 05:38:30 1.6
@@ -15,7 +15,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;
-import org.apache.ant.datatypes.DataTypeEngine;
import org.apache.ant.convert.ConverterEngine;
import org.apache.ant.convert.ConverterRegistry;
import org.apache.ant.convert.DefaultConverterInfo;
@@ -82,7 +81,7 @@
m_converterRegistry = converterEngine.getRegistry();
final DataTypeEngine dataTypeEngine =
(DataTypeEngine)componentManager.
- lookup( "org.apache.ant.datatypes.DataTypeEngine" );
+ lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" );
m_dataTypeRegistry = dataTypeEngine.getRegistry();
}
1.8 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java
Index: TaskletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TaskletEngine.java 2001/01/08 04:36:46 1.7
+++ TaskletEngine.java 2001/02/07 05:38:30 1.8
@@ -10,7 +10,7 @@
import org.apache.ant.AntException;
import org.apache.ant.configuration.Configuration;
import org.apache.ant.convert.ConverterEngine;
-import org.apache.ant.datatypes.DataTypeEngine;
+import org.apache.ant.tasklet.engine.DataTypeEngine;
import org.apache.ant.tasklet.TaskletContext;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
