* Moved ExecuteJava -> framework.java package. Added a bunch of Javadocs,

and i18n-ed the error and log messages.

* Moved Java -> antlib.java.JavaTask.

* Moved Path and friends -> framework.file package.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271927 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/build.xml

@@ -506,6 +506,10 @@ Legal:
         <ant antfile="antlib.xml">
           <property name="antlib.name" value="vfile"/>
         </ant>
+
+        <ant antfile="antlib.xml">
+          <property name="antlib.name" value="java"/>
+        </ant>
     </target>
 
     <!-- Compiles and runs the unit tests -->

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;
 
 /**

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;
         }

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

proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java → 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();

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;

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;
 
 /**

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.
  *
  * <p>To execute a native process, configure an instance of this class,
  * and then call its {@link #execute} method.

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}.
-

proposal/myrmidon/src/todo/org/apache/tools/todo/types/ArrayFileList.java → 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 <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  */
-class ArrayFileList
+public class ArrayFileList
     implements FileList
 {
     private final String[] m_parts;

proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java → 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;

proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/FileListToStringConverter.java → 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 <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @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

proposal/myrmidon/src/todo/org/apache/tools/todo/types/ParsedPathElement.java → 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 <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  */
-class ParsedPathElement
+public class ParsedPathElement
     implements FileList
 {
     private final String m_path;

proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java → 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

proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java → 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 <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @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

proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java → 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.
+ *
+ * <p>To execute a Java application, create an instance of this class,
+ * configure it, and call one of the following methods:
+ * <ul>
+ * <li>{@link #execute}
+ * <li>{@link #executeForked}
+ * <li>{@link #executeNonForked}
+ * </ul>
  *
  * @author thomas.haas@softwired-inc.com
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
 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();

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.

proposal/myrmidon/src/manifest/ant1-ant-descriptor.xml

@@ -1,15 +1,6 @@
 <ant-lib version="1.0">
 
     <types>
-        <task name="java" classname="org.apache.tools.todo.taskdefs.Java" />
-        <data-type name="path" classname="org.apache.tools.todo.types.Path" />
-        <task name="path" classname="org.apache.myrmidon.framework.TypeInstanceTask" />
-        <converter classname="org.apache.tools.todo.types.converters.StringToPathConverter"
-                   source="java.lang.String"
-                   destination="org.apache.tools.todo.types.Path" />
-        <converter classname="org.apache.tools.todo.types.converters.FileListToStringConverter"
-                   source="org.apache.tools.todo.types.FileList"
-                   destination="java.lang.String" />
     </types>
 
 </ant-lib>

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.

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 <a href="http://www.reliable-systems.com/tools/">
@@ -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 );

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;
 
 /**

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

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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
 {

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;
 

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. <p>

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. <p>

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;
 
 /**

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() );

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 

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;
 
 /**

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;
 
 /**

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;
 
 /**

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&ouml;rger</a>
  */
 public class StyleBook
-    extends Java
+    extends JavaTask
 {
     private File m_book;
     private String m_loaderConfig;

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. <p>

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;
 
 /**

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
 {

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.