diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index 11b2f993e..663ebff0e 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -506,6 +506,10 @@ Legal: + + + + diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java index a7713a692..0f4486898 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/AbstractAvailableCondition.java @@ -12,7 +12,7 @@ import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.conditions.Condition; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java index 5f574d768..d0b2010ac 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java @@ -33,11 +33,13 @@ public class StringToBooleanConverter throws ConverterException { final String string = (String)object; - if( string.equals( "true" ) ) + if( string.equalsIgnoreCase( "true" ) + || string.equalsIgnoreCase( "yes" ) ) { return Boolean.TRUE; } - else if( string.equals( "false" ) ) + else if( string.equalsIgnoreCase( "false" ) + || string.equalsIgnoreCase( "no" ) ) { return Boolean.FALSE; } diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java index 14334aa0b..d5dc1a7a4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java @@ -13,7 +13,7 @@ import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * This task compiles CSharp source into executables or modules. The task will diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java rename to proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java index c342a7010..3794a6134 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/java/JavaTask.java @@ -5,14 +5,15 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.taskdefs; +package org.apache.antlib.java; import java.io.File; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.EnvironmentVariable; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * This task acts as a loader for java applications but allows to use the same @@ -24,7 +25,7 @@ import org.apache.tools.todo.types.Path; * * @ant:task name="java" */ -public class Java +public class JavaTask extends AbstractTask { private final ExecuteJava m_exec = new ExecuteJava(); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java index d41ae494c..847c28e2f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java @@ -19,7 +19,7 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.ScannerUtil; import org.xml.sax.EntityResolver; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index 09c12a1ef..bab827fa1 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.AbstractMatchingTask; import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java index a87a84434..20c88b5d7 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java @@ -21,8 +21,8 @@ import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.util.FileUtils; /** - * This is a utility class designed to make executing native - * processes easier in the context of ant. + * This is a utility class designed to make executing native processes easier + * in the context of ant. * *

To execute a native process, configure an instance of this class, * and then call its {@link #execute} method. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties index a98af85d6..fd7cc1ee6 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Resources.properties @@ -26,4 +26,3 @@ execute.failed.error=Command "{0}" failed. execute.bad-resultcode.error=Command "{0}" returned unexpected exit code {1}. execute.command.notice=Executing: {0} execute.env-vars.notice=Using environment: {0}. - diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ArrayFileList.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ArrayFileList.java similarity index 92% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/ArrayFileList.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ArrayFileList.java index 3e49118d8..1a2de020b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ArrayFileList.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ArrayFileList.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types; +package org.apache.myrmidon.framework.file; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; @@ -16,7 +16,7 @@ import org.apache.myrmidon.api.TaskException; * @author Adam Murdoch * @version $Revision$ $Date$ */ -class ArrayFileList +public class ArrayFileList implements FileList { private final String[] m_parts; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java index 880298d84..81e9c3445 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileList.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types; +package org.apache.myrmidon.framework.file; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/FileListToStringConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java similarity index 87% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/FileListToStringConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java index 90642b9cc..4ad7d56b7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/FileListToStringConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/FileListToStringConverter.java @@ -5,13 +5,13 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types.converters; +package org.apache.myrmidon.framework.file; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.types.FileList; +import org.apache.myrmidon.framework.file.FileList; import org.apache.tools.todo.types.PathUtil; /** @@ -20,7 +20,7 @@ import org.apache.tools.todo.types.PathUtil; * @author Adam Murdoch * @version $Revision$ $Date$ * - * @ant:converter source="org.apache.tools.todo.types.FileList" destination="java.lang.String" + * @ant:converter source="org.apache.myrmidon.framework.file.FileList" destination="java.lang.String" */ public class FileListToStringConverter extends AbstractConverter diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ParsedPathElement.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ParsedPathElement.java similarity index 87% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/ParsedPathElement.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ParsedPathElement.java index bc37979fa..ebafdb677 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ParsedPathElement.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/ParsedPathElement.java @@ -5,10 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types; +package org.apache.myrmidon.framework.file; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.FileList; import org.apache.tools.todo.util.FileUtils; /** @@ -17,7 +18,7 @@ import org.apache.tools.todo.util.FileUtils; * @author Adam Murdoch * @version $Revision$ $Date$ */ -class ParsedPathElement +public class ParsedPathElement implements FileList { private final String m_path; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java index eb09c6ba3..2fd5b90d1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java @@ -5,14 +5,19 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types; +package org.apache.myrmidon.framework.file; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.DataType; +import org.apache.myrmidon.framework.file.ArrayFileList; +import org.apache.myrmidon.framework.file.FileList; import org.apache.tools.todo.util.FileUtils; +import org.apache.tools.todo.types.FileSet; +import org.apache.tools.todo.types.DirectoryScanner; +import org.apache.tools.todo.types.ScannerUtil; /** * This object represents a path as used by CLASSPATH or PATH environment diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java similarity index 90% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java index 9e1ee7e98..d68c9afdb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/StringToPathConverter.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.types.converters; +package org.apache.myrmidon.framework.file; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * A converter from String to Path. @@ -17,7 +17,7 @@ import org.apache.tools.todo.types.Path; * @author Adam Murdoch * @version $Revision$ $Date$ * - * @ant:converter source="java.lang.String" destination="org.apache.tools.todo.types.Path" + * @ant:converter source="java.lang.String" destination="org.apache.myrmidon.framework.file.Path" */ public class StringToPathConverter extends AbstractConverter diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java similarity index 64% rename from proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java index 474abd3c6..b9b5534e8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/ExecuteJava.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.todo.taskdefs; +package org.apache.myrmidon.framework.java; import java.io.File; import java.lang.reflect.InvocationTargetException; @@ -18,20 +18,33 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.EnvironmentData; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.SysProperties; import org.apache.tools.todo.util.FileUtils; +import org.apache.avalon.excalibur.i18n.ResourceManager; +import org.apache.avalon.excalibur.i18n.Resources; /** - * A utility class that executes a Java app, either in this JVM, or a forked - * JVM. + * A utility class that takes care of executing a Java application. This + * class can execute Java apps in the current JVM, or a forked JVM. + * + *

To execute a Java application, create an instance of this class, + * configure it, and call one of the following methods: + *

* * @author thomas.haas@softwired-inc.com * @author Stefan Bodewig */ public class ExecuteJava { + private final static Resources REZ + = ResourceManager.getPackageResources( ExecuteJava.class ); + private final Path m_classPath = new Path(); private final EnvironmentData m_sysProperties = new EnvironmentData(); private final Commandline m_args = new Commandline(); @@ -44,36 +57,58 @@ public class ExecuteJava private String m_maxMemory; private boolean m_ignoreReturnCode; + /** + * Sets the main class of the application. + */ public void setClassName( final String className ) { m_className = className; } + /** + * Sets the executable jar file to use to execute the application. + * Can only be used in forked mode. + */ public void setJar( final File jar ) { m_jar = jar; } + /** + * Enables forked mode. + */ public void setFork( final boolean fork ) { m_fork = fork; } /** - * Sets the max memory to use when running the application in a forked JVM. + * Sets the max memory allocation pool size to use when running the + * application. Only used in forked mode. * - * @param maxMemory the maximum memory, or null for the default. + * @param maxMemory the maximum memory pool size, or null for the default. */ public void setMaxMemory( final String maxMemory ) { m_maxMemory = maxMemory; } + /** + * Sets the working directory for the application. Only used in forked mode. + */ public void setWorkingDirectory( final File workingDirectory ) { m_workingDirectory = workingDirectory; } + /** + * Disables checking of the application's return code. Only used in forked + * mode. + * + * @param ignore If true, the return code of the application is ignored. + * If false, an exception is thrown if the application does + * no exit with a 0 return code. + */ public void setIgnoreReturnCode( boolean ignore ) { m_ignoreReturnCode = ignore; @@ -90,21 +125,43 @@ public class ExecuteJava m_jvm = jvm; } + /** + * Returns the classpath that will be used to execute the application. + * + * @return the application's classpath. This path can be modified. + */ public Path getClassPath() { return m_classPath; } + /** + * Returns the system properties that will be used for the application. + * Only used in forked mode. + * + * @return the application's system properties. Can be modified. + */ public EnvironmentData getSysProperties() { return m_sysProperties; } + /** + * Returns the arguments that will be used for the application. + * + * @return the application's arguments. Can be modified. + */ public Commandline getArguments() { return m_args; } + /** + * Returns the JVM arguments that will be used to execute the application. + * Only used in forked mode. + * + * @return the JVM aguments. Can be modified. + */ public Commandline getVmArguments() { return m_vmArgs; @@ -134,27 +191,43 @@ public class ExecuteJava { if( m_className == null ) { - throw new TaskException( "Classname must not be null." ); + final String message = REZ.getString( "executejava.no-classname.error" ); + throw new TaskException( message ); } if( m_jar != null ) { - throw new TaskException( "Cannot execute a jar in non-forked mode." ); + final String message = REZ.getString( "executejava.jar-no-fork.error" ); + throw new TaskException( message ); } if( m_vmArgs.size() > 0 ) { - context.warn( "JVM args ignored when same JVM is used." ); + final String message = REZ.getString( "executejava.ignore-jvm-args.notice" ); + context.warn( message ); } if( m_workingDirectory != null ) { - context.warn( "Working directory ignored when same JVM is used." ); + final String message = REZ.getString( "executejava.ignore-dir.notice" ); + context.warn( message ); + } + if( m_maxMemory != null ) + { + final String message = REZ.getString( "executejava.ignore-maxmem.notice" ); + context.warn( message ); } if( m_sysProperties.size() > 0 ) { - context.warn( "System properties ignored when same JVM is used." ); + final String message = REZ.getString( "executejava.ignore-sys-props.notice" ); + context.warn( message ); } final String[] args = m_args.getArguments(); - context.debug( "Running in same VM: " + m_className + " " + FileUtils.formatCommandLine( args ) ); + + // Log message + final String debugMessage + = REZ.getString( "executejava.exec-in-jvm.notice", + m_className, + FileUtils.formatCommandLine( args ) ); + context.info( debugMessage ); // Locate the class final Class target; @@ -173,7 +246,8 @@ public class ExecuteJava } catch( final Exception e ) { - throw new TaskException( "Could not find class \"" + m_className + "\".", e ); + final String message = REZ.getString( "executejava.find-class.error", m_className ); + throw new TaskException( message, e ); } // Call the main method @@ -186,11 +260,13 @@ public class ExecuteJava catch( final InvocationTargetException e ) { final Throwable t = e.getTargetException(); - throw new TaskException( "Could not execute class \"" + m_className + "\".", t ); + final String message = REZ.getString( "executejava.execute-app.error", m_className ); + throw new TaskException( message, t ); } catch( final Exception e ) { - throw new TaskException( "Could not execute class \"" + m_className + "\".", e ); + final String message = REZ.getString( "executejava.execute-app.error", m_className ); + throw new TaskException( message, e ); } } @@ -203,11 +279,13 @@ public class ExecuteJava // Validate if( m_className != null && m_jar != null ) { - throw new TaskException( "Only one of Classname and Jar can be set." ); + final String message = REZ.getString( "executejava.class-and-jar.error" ); + throw new TaskException( message ); } - else if( m_className == null && m_jar == null ) + if( m_className == null && m_jar == null ) { - throw new TaskException( "Classname must not be null." ); + final String message = REZ.getString( "executejava.no-classname.error" ); + throw new TaskException( message ); } final Execute exe = new Execute(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/Resources.properties b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/Resources.properties new file mode 100644 index 000000000..1fafa9996 --- /dev/null +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/Resources.properties @@ -0,0 +1,10 @@ +executejava.exec-in-jvm.notice=Running in same VM: {0} {1}. +executejava.ignore-jvm-args.notice=JVM args are ignored when using non-forked mode. +executejava.ignore-dir.notice=Working directory is ignored when using non-forked mode. +executejava.ignore-maxmem.notice=Maximum memory pool size is ignored when using non-forked mode. +executejava.ignore-sys-props.notice=System properties are ignored when using non-forked mode. +executejava.no-classname.error=No class-name specified. +executejava.jar-no-fork.error=Cannot execute a jar in non-forked mode. +executejava.find-class.error=Could not find main class "{0}". +executejava.execute-app.error=Could not execute class "{0}". +executejava.class-and-jar.error=Cannot specify both a Jar file and a main class. diff --git a/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml b/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml index 120d447e6..0917f0aaa 100644 --- a/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml +++ b/proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml @@ -1,15 +1,6 @@ - - - - - \ No newline at end of file diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java index ccb30c947..08cb3f612 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java @@ -13,8 +13,9 @@ import java.io.FileReader; import java.net.URL; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * ANTLR task. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java index de46dee41..f537290f6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java @@ -20,8 +20,9 @@ import org.apache.myrmidon.listeners.LogEvent; import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; import org.apache.tools.todo.taskdefs.javac.Javac; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; +import org.apache.antlib.java.JavaTask; /** * Instruments Java classes with @@ -737,7 +738,7 @@ public class IContract extends MatchingTask iContractClasspath.addLocation( buildDir ); // Create a forked java process - Java iContract = null;//(Java)getProject().createTask( "java" ); + JavaTask iContract = null;//(Java)getProject().createTask( "java" ); iContract.setFork( true ); iContract.setClassname( "com.reliablesystems.iContract.Tool" ); iContract.setClasspath( iContractClasspath ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java index b57bccf8f..36eb8e39a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Javah.java @@ -15,7 +15,7 @@ import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java index c19556bff..8d3b76349 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * This task converts path and classpath information to a specific target OS diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java index 03982ad8a..1fa565129 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java @@ -16,7 +16,7 @@ import java.util.Iterator; import java.util.Properties; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java index 7c7118d67..ff43c7e4b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java @@ -37,7 +37,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.EnumeratedAttribute; import org.apache.tools.todo.types.FileSet; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java index c3f232980..8270fcb51 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java @@ -17,7 +17,7 @@ import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java index 233c30314..f1c244f40 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java @@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java index c18f934fc..8dc9cb840 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java @@ -15,7 +15,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.SourceFileScanner; import org.apache.tools.todo.util.mappers.GlobPatternMapper; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java index 8faea4cb1..107824006 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java @@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java index 11ad1d3e2..b3edc8e4b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java @@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java index 82984b8c3..f39b7e57b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java @@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.javac; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java index 39e2f27e8..05edba4c5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JJTree.java @@ -12,8 +12,8 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java index 890d4b8ea..41c47e92b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javacc/JavaCC.java @@ -12,8 +12,8 @@ import java.util.Enumeration; import java.util.Hashtable; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java index 0d2cc7ed6..9098d0201 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java @@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.javadoc; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; public class DocletInfo { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java index 1aeb6bd55..c688ba997 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java @@ -24,7 +24,7 @@ import org.apache.myrmidon.framework.Pattern; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java index ad2f098c3..2a5742824 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jdepend/JDependTask.java @@ -13,8 +13,8 @@ import java.io.IOException; import java.io.PrintWriter; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.java.ExecuteJava; +import org.apache.myrmidon.framework.file.Path; /** * Ant task to run JDepend tests.

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java index 1532c9d25..df2a1c0eb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/JspC.java @@ -15,7 +15,7 @@ import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapter; import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapterFactory; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * Ant task to run the jsp compiler.

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java index 952ef4784..a08387adc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/WLJspc.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java index 20d0948e8..faf4b8d39 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.java @@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.jsp.compilers; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.todo.taskdefs.Java; +import org.apache.antlib.java.JavaTask; import org.apache.tools.todo.taskdefs.jsp.JspC; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.Commandline; @@ -37,7 +37,7 @@ public class JasperC // Create an instance of the compiler, redirecting output to // the project log //FIXME - Java java = null;//(Java)( getJspc().getProject() ).createTask( "java" ); + JavaTask java = null;//(Java)( getJspc().getProject() ).createTask( "java" ); if( getJspc().getClasspath() != null ) { java.addClasspath( getJspc().getClasspath() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java index 11de5368a..b2ffc8b33 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/JUnitTask.java @@ -19,13 +19,13 @@ import java.util.Random; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.EnumeratedAttribute; import org.apache.tools.todo.types.EnvironmentData; import org.apache.tools.todo.types.EnvironmentVariable; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.SysProperties; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java index 148e8a800..3a6ba6541 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java @@ -17,11 +17,11 @@ import java.util.Iterator; import java.util.Random; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileSet; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java index d0ad8981c..ee89eb045 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MAudit.java @@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.metamata; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java index 2e29ac6fd..f4fcc59f8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MMetrics.java @@ -14,7 +14,7 @@ import java.io.IOException; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.taskdefs.exec.ExecuteStreamHandler; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java index 74309ce7b..51174a3a2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/MParse.java @@ -16,9 +16,9 @@ import java.util.Random; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.ExecuteJava; +import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java index 95d296022..06d03df80 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java @@ -14,7 +14,7 @@ import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java index 6cf07b962..ff5982efe 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java @@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; import org.apache.tools.todo.types.SourceFileScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java index 3a0a4d9a9..036297c62 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java @@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.FileNameMapper; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.taskdefs.rmic.Rmic; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java index 0e2307282..0aba98b9f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovReport.java @@ -22,7 +22,7 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.EnumeratedAttribute; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.w3c.dom.Document; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java index 15963e1eb..64d46df1c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java @@ -19,7 +19,7 @@ import org.apache.myrmidon.framework.Execute; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.FileSet; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.types.PathUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java index f8d0a8d71..7bbdf26a7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/stylebook/StyleBook.java @@ -9,7 +9,7 @@ package org.apache.tools.todo.taskdefs.stylebook; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.Java; +import org.apache.antlib.java.JavaTask; import org.apache.tools.todo.types.Argument; /** @@ -20,7 +20,7 @@ import org.apache.tools.todo.types.Argument; * Börger */ public class StyleBook - extends Java + extends JavaTask { private File m_book; private String m_loaderConfig; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java index b5ae19ecb..16ad8ef59 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/vss/MSVSSGET.java @@ -10,7 +10,7 @@ package org.apache.tools.todo.taskdefs.vss; import java.io.File; import org.apache.myrmidon.api.TaskException; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.Path; +import org.apache.myrmidon.framework.file.Path; /** * Task to perform GET commands to Microsoft Visual Source Safe.

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java index 05d15e9e5..33e8d6e51 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java @@ -9,6 +9,7 @@ package org.apache.tools.todo.types; import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; import org.apache.tools.todo.util.FileUtils; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java index 2c5fbbccb..48e939a29 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java @@ -9,6 +9,7 @@ package org.apache.tools.todo.types; import java.io.File; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; public class EnvironmentVariable { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java index 2495d12cf..3038b6fdc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java @@ -13,6 +13,7 @@ import java.net.URL; import java.util.Locale; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.file.Path; /** * Utilities for operating on Path objects.