Browse Source

Updated to reflect new packaging

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268604 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
9743220594
3 changed files with 10 additions and 12 deletions
  1. +8
    -9
      proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java
  2. +1
    -2
      proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java
  3. +1
    -1
      proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java

+ 8
- 9
proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java View File

@@ -14,7 +14,6 @@ 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.datatypes.DataTypeEngine;
import org.apache.ant.tasklet.Tasklet;
import org.apache.ant.tasklet.TaskletContext;
import org.apache.avalon.AbstractLoggable;
@@ -89,14 +88,14 @@ public class DefaultTaskletEngine
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
- 2
proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTskDeployer.java View File

@@ -15,7 +15,6 @@ import java.util.Iterator;
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 @@ public class DefaultTskDeployer
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
- 1
proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEngine.java View File

@@ -10,7 +10,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.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;


Loading…
Cancel
Save