Move all but the optional tasks into the hierarchy o.a.t.todo rather than o.a.t.ant so as not to clash with ant1 compatability later

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

proposal/myrmidon/build.xml

@@ -273,9 +273,9 @@ Legal:
             <exclude name="org/apache/aut/vfs/provider/smb/**" unless="jcifs.present"/>
         </patternset>
 
-        <property name="ant.package" value="org/apache/tools/ant"/>
+        <property name="ant.package" value="org/apache/tools/todo"/>
         <property name="antlib.package" value="org/apache/antlib"/>
-        <property name="optional.package" value="${ant.package}/taskdefs/optional"/>
+        <property name="optional.package" value="org/apache/tools/ant/taskdefs/optional"/>
         <property name="optional.type.package" value="${ant.package}/types/optional"/>
         <property name="util.package" value="${ant.package}/util"/>
         <property name="regexp.package" value="${util.package}/regexp"/>

proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java

@@ -24,9 +24,9 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.AbstractMatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * This task can be used to create checksums for files. It can also be used to

proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java

@@ -14,7 +14,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task as a layer on top of patch. Patch applies a diff file to an original.

proposal/myrmidon/src/java/org/apache/antlib/core/Available.java

@@ -12,8 +12,8 @@ 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.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
 
 /**
  * A condition that evaluates to true if the requested class or resource

proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java

@@ -13,8 +13,8 @@ import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Task to interact with a CVS repository.

proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java

@@ -13,10 +13,10 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
+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;
 
 /**
  * This task compiles CSharp source into executables or modules. The task will

proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java

@@ -13,9 +13,9 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.DirectoryScanner;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 /**
  * Task to assemble .net 'Intermediate Language' files. The task will only work

proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java

@@ -20,11 +20,11 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.IdentityMapper;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
+import org.apache.tools.todo.types.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.IdentityMapper;
 
 /**
  * This is a task used to copy files.

proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java

@@ -14,9 +14,9 @@ import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Deletes a file or directory, or set of files defined by a fileset.

proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java

@@ -19,9 +19,9 @@ import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Touch a file and/or fileset(s) -- corresponds to the Unix touch command.

proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java

@@ -17,10 +17,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.EnvironmentData;
-import org.apache.tools.ant.types.EnvironmentVariable;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.EnvironmentData;
+import org.apache.tools.todo.types.EnvironmentVariable;
 
 /**
  * Executes a native command.

proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java

@@ -12,7 +12,7 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Generates a key.

proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java

@@ -18,10 +18,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+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.ScannerUtil;
 
 /**
  * Sign a archive.

proposal/myrmidon/src/java/org/apache/antlib/vfile/PathFileList.java

@@ -12,7 +12,7 @@ import org.apache.aut.vfs.FileSystemException;
 import org.apache.aut.vfs.FileSystemManager;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * A path made up of file names separated by ; and : characters.  Similar to

proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java

@@ -17,11 +17,11 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
+import org.apache.tools.todo.types.ScannerUtil;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.Parser;

proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java

@@ -25,9 +25,9 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.AbstractMatchingTask;
 import org.apache.myrmidon.framework.FileSet;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * A Task to process via XSLT a set of XML documents. This is useful for

proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java

@@ -15,7 +15,7 @@ import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecMetaData;
 import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * This is a utility class designed to make executing native

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java

@@ -17,11 +17,11 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.ExecuteJava;
+import org.apache.tools.todo.taskdefs.ExecuteJava;
 import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.Path;
 
 /**
  * ANTLR task.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java

@@ -20,11 +20,11 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+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.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Create a CAB archive.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java

@@ -16,7 +16,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Properties;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Instance of this class represents nested elements of a task propertyfile.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java

@@ -19,12 +19,12 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.listeners.AbstractProjectListener;
 import org.apache.myrmidon.listeners.LogEvent;
-import org.apache.tools.ant.taskdefs.Java;
-import org.apache.tools.ant.taskdefs.compilers.Javac;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.taskdefs.Java;
+import org.apache.tools.todo.taskdefs.javac.Javac;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Instruments Java classes with <a href="http://www.reliable-systems.com/tools/">

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java

@@ -15,9 +15,9 @@ import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Task to generate JNI header files using javah. This task can take the

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java

@@ -22,8 +22,8 @@ import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 /**
  * Task to compile NetRexx source files. This task can take the following

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.Java;
-import org.apache.tools.ant.types.Argument;
+import org.apache.tools.todo.taskdefs.Java;
+import org.apache.tools.todo.types.Argument;
 
 /**
  * Basic task for apache stylebook.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java

@@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.ccm;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Class common to all check commands (checkout, checkin,checkin default task);

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java

@@ -11,7 +11,7 @@ import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task allows to create new ccm task and set it as the default

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.ccm;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task allows to reconfigure a project, recurcively or not

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java

@@ -13,7 +13,7 @@ import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A base class for creating tasks for executing commands on Continuus 5.1 <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task to perform Checkin command to ClearCase. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task to perform Checkout command to ClearCase. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task to perform UnCheckout command to ClearCase. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task to perform an Update command to ClearCase. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java

@@ -12,7 +12,7 @@ import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A base class for creating tasks for executing commands on ClearCase. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java

@@ -22,10 +22,10 @@ import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Translates text embedded in files using Resource Bundle files.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java

@@ -15,10 +15,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
 
 /**
  * Taskdef for the JJTree compiler compiler.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java

@@ -15,10 +15,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
 
 /**
  * Taskdef for the JavaCC compiler compiler.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java

@@ -7,7 +7,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional.jdepend;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class FormatAttribute
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -16,10 +16,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Ant task to run JDepend tests. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java

@@ -13,11 +13,11 @@ import java.util.Date;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.todo.taskdefs.MatchingTask;
 import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter;
 import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Ant task to run the jsp compiler. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java

@@ -12,13 +12,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.Java;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.taskdefs.Java;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc)
@@ -154,8 +152,6 @@ public class WLJspc extends MatchingTask
             throw new TaskException( "package attribute must be present." );
         }
 
-        String systemClassPath = System.getProperty( "java.class.path" );
-
         pathToPackage = this.destinationPackage.replace( '.', File.separatorChar );
         // get all the files in the sourceDirectory
         DirectoryScanner ds = super.getDirectoryScanner( sourceDirectory );
@@ -272,7 +268,6 @@ public class WLJspc extends MatchingTask
             // Can be written better... this is too hacky!
             jspFile = new File( files[ i ] );
             parents = jspFile.getParent();
-            int loc = 0;
 
             if( ( parents != null ) && ( !( "" ).equals( parents ) ) )
             {

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java

@@ -12,7 +12,7 @@ import java.util.Iterator;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * This is the default implementation for the CompilerAdapter interface. This is

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java

@@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.todo.taskdefs.Java;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * The implementation of the jasper compiler. This is a cut-and-paste of the

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java

@@ -18,7 +18,7 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 import org.w3c.dom.Document;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java

@@ -12,9 +12,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java

@@ -11,7 +11,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

@@ -22,14 +22,14 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.EnvironmentVariable;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
-import org.apache.tools.ant.types.SysProperties;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnvironmentVariable;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
+import org.apache.tools.todo.types.SysProperties;
 
 /**
  * Ant task to run JUnit tests. <p>
@@ -112,7 +112,6 @@ public class JUnitTask extends AbstractTask
     private Integer timeout = null;
     private boolean summary = false;
     private String summaryValue = "";
-    private boolean filtertrace = true;
     private JUnitTestRunner runner = null;
 
     /**
@@ -358,8 +357,6 @@ public class JUnitTask extends AbstractTask
     /**
      * Create a new JVM argument. Ignored if no JVM is forked.
      *
-     * @return create a new JVM argument so that any argument can be passed to
-     *      the JVM.
      * @see #setFork(boolean)
      */
     public void addJvmarg( final Argument argument )

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java

@@ -21,9 +21,9 @@ import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java

@@ -20,13 +20,13 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Somewhat abstract framework to be used for other metama 2.0 tasks. This

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java

@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Metamata Audit evaluates Java code for programming errors, weaknesses, and

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java

@@ -13,8 +13,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.taskdefs.exec.ExecuteStreamHandler;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Calculates global complexity and quality metrics on Java source code. You

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java

@@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
-import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
+import org.apache.tools.todo.taskdefs.exec.ExecuteStreamHandler;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java

@@ -19,10 +19,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Simple Metamata MParse task based on the original written by <a

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/Action.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.net;
 
 import java.util.Locale;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class Action
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

@@ -25,9 +25,9 @@ import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.FileScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.FileScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Basic FTP client that performs the following actions:

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPDirectoryScanner.java

@@ -13,7 +13,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.DirectoryScanner;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 class FTPDirectoryScanner
     extends DirectoryScanner

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java

@@ -26,9 +26,9 @@ import javax.mail.internet.MimeMultipart;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * A task to send SMTP email. This version has near identical syntax to the

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java

@@ -12,9 +12,9 @@ import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * P4Add - add the specified files to perforce. <b>Example Usage:</b>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java

@@ -14,7 +14,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.oro.text.perl.Perl5Util;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Base class for Perforce (P4) ANT tasks. See individual task for example

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java

@@ -26,7 +26,7 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A task that fetches source files from a PVCS archive <b>19-04-2001</b> <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java

@@ -19,7 +19,7 @@ import java.util.StringTokenizer;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Checks out files from a specific StarTeam server, project, view, and folder.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java

@@ -18,10 +18,10 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+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.ScannerUtil;
 
 /**
  * Convenient task to run the snapshot merge utility for JProbe Coverage.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java

@@ -22,9 +22,9 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.Path;
 import org.w3c.dom.Document;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java

@@ -18,11 +18,11 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Convenient task to run Sitraka JProbe Coverage from Ant. Options are pretty

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java

@@ -7,7 +7,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional.sitraka;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class Finalsnapshot
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java

@@ -7,7 +7,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional.sitraka;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class Javavm
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java

@@ -7,7 +7,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional.sitraka;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class Recordfromstart
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.sitraka;
 
 import java.util.ArrayList;
-import org.apache.tools.ant.util.regexp.RegexpMatcher;
-import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
+import org.apache.tools.todo.util.regexp.RegexpMatcher;
+import org.apache.tools.todo.util.regexp.RegexpMatcherFactory;
 
 /**
  * Filters information from coverage, somewhat similar to a <tt>FileSet</tt> .

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java

@@ -13,7 +13,7 @@ import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A base class for creating tasks for executing commands on Visual SourceSafe.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java

@@ -11,8 +11,8 @@ import java.io.File;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Task to perform CheckIn commands to Microsoft Visual Source Safe.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java

@@ -11,8 +11,8 @@ import java.io.File;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Task to perform CheckOut commands to Microsoft Visual Source Safe.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java

@@ -11,8 +11,8 @@ import java.io.File;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Task to perform GET commands to Microsoft Visual Source Safe. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java

@@ -15,8 +15,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Task to perform HISTORY commands to Microsoft Visual Source Safe.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java

@@ -8,7 +8,7 @@
 package org.apache.tools.ant.taskdefs.optional.vss;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * Task to perform LABEL commands to Microsoft Visual Source Safe. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/DependSet.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -15,10 +15,10 @@ import org.apache.aut.nativelib.Os;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileList;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileList;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * A Task to record explicit dependencies. If any of the target files are out of
@@ -122,7 +122,7 @@ public class DependSet extends MatchingTask
     /**
      * Executes the task.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Echo.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -69,7 +69,7 @@ public class Echo
     /**
      * Does the work.
      *
-     * @exception TaskException if someting goes wrong with the build
+     * @exception org.apache.myrmidon.api.TaskException if someting goes wrong with the build
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ExecuteJava.java

@@ -5,17 +5,17 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
-import org.apache.tools.ant.types.SysProperties;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
+import org.apache.tools.todo.types.SysProperties;
 
 /*
  * @author thomas.haas@softwired-inc.com

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FileDir.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/FileDir.java

@@ -5,9 +5,9 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class FileDir
     extends EnumeratedAttribute

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Get.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -121,7 +121,7 @@ public class Get extends AbstractTask
     /**
      * Does the work.
      *
-     * @exception TaskException Thrown in unrecoverable error.
+     * @exception org.apache.myrmidon.api.TaskException Thrown in unrecoverable error.
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Java.java

@@ -5,21 +5,19 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
-import java.io.PrintStream;
 import java.util.ArrayList;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Argument;
-import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.EnvironmentVariable;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.types.CommandlineJava;
+import org.apache.tools.todo.types.EnvironmentVariable;
+import org.apache.tools.todo.types.Path;
 
 /**
  * This task acts as a loader for java applications but allows to use the same
@@ -35,7 +33,6 @@ public class Java
     private CommandlineJava m_cmdl = new CommandlineJava();
     private boolean m_fork;
     private File m_dir;
-    private PrintStream m_outStream;
 
     /**
      * Set the class name.
@@ -57,7 +54,7 @@ public class Java
     /**
      * The working directory of the process
      *
-     * @param d The new Dir value
+     * @param dir The new Dir value
      */
     public void setDir( final File dir )
     {
@@ -135,7 +132,7 @@ public class Java
      *
      * @return the return code from the execute java class if it was executed in
      *      a separate VM (fork = "yes").
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public int executeJava()
         throws TaskException

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/MatchingTask.java

@@ -5,16 +5,16 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Pattern;
 import org.apache.myrmidon.framework.PatternSet;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * This is an abstract task that should be used by all those tasks that require

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/PathConvert.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ import org.apache.aut.nativelib.Os;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
 
 /**
  * This task converts path and classpath information to a specific target OS
@@ -205,7 +205,7 @@ public class PathConvert extends AbstractTask
     /**
      * Validate that all our parameters have been properly initialized.
      *
-     * @throws TaskException if something is not setup properly
+     * @throws org.apache.myrmidon.api.TaskException if something is not setup properly
      */
     private void validate()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Property.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,8 +17,8 @@ import java.util.Properties;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
 
 /**
  * Will set a Project property. Used to be a hack in ProjectHelper Will not

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Rpm.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.ant.taskdefs.unix;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import org.apache.aut.nativelib.ExecManager;
@@ -13,7 +13,7 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * @author lucas@collab.net

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/SQLExec.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -35,12 +35,12 @@ import java.util.StringTokenizer;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
-import org.apache.tools.ant.types.ScannerUtil;
+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.tools.todo.types.PathUtil;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Reads in a text file containing SQL statements seperated with semicolons and
@@ -364,7 +364,7 @@ public class SQLExec
     /**
      * Load the sql file and then execute it
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
@@ -617,7 +617,7 @@ public class SQLExec
      *
      * @param sql Description of Parameter
      * @param out Description of Parameter
-     * @exception SQLException Description of Exception
+     * @exception java.sql.SQLException Description of Exception
      */
     protected void execSQL( String sql, PrintStream out )
         throws SQLException

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Tstamp.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -19,7 +19,7 @@ import java.util.StringTokenizer;
 import java.util.TimeZone;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Sets TSTAMP, DSTAMP and TODAY

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/UpToDate.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.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -14,11 +14,11 @@ import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
+import org.apache.tools.todo.types.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.MergingMapper;
 
 /**
  * Will set the given property if the specified target has a timestamp greater
@@ -136,7 +136,7 @@ public class UpToDate
      * Sets property to true if target files have a more recent timestamp than
      * each of the corresponding source files.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/WaitFor.java

@@ -5,14 +5,14 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs;
+package org.apache.tools.todo.taskdefs;
 
 import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.framework.conditions.AndCondition;
 import org.apache.myrmidon.framework.conditions.Condition;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Wait for an external event to occur. Wait for an external process to start or
@@ -108,7 +108,7 @@ public class WaitFor
      * Check repeatedly for the specified conditions until they become true or
      * the timeout expires.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Ear.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Expand.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -21,10 +21,10 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.framework.PatternSet;
 import org.apache.myrmidon.framework.PatternUtil;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
 
 /**
  * Unzip a file.
@@ -97,7 +97,7 @@ public abstract class Expand
     /**
      * Do the work.
      *
-     * @exception TaskException Thrown in unrecoverable error.
+     * @exception org.apache.myrmidon.api.TaskException Thrown in unrecoverable error.
      */
     public void execute()
         throws TaskException

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Jar.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,10 +23,10 @@ import org.apache.aut.zip.ZipOutputStream;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.manifest.Manifest;
-import org.apache.tools.ant.taskdefs.manifest.ManifestException;
-import org.apache.tools.ant.taskdefs.manifest.ManifestUtil;
-import org.apache.tools.ant.types.FileScanner;
+import org.apache.tools.todo.taskdefs.manifest.Manifest;
+import org.apache.tools.todo.taskdefs.manifest.ManifestException;
+import org.apache.tools.todo.taskdefs.manifest.ManifestUtil;
+import org.apache.tools.todo.types.FileScanner;
 
 /**
  * Creates a JAR archive.
@@ -156,7 +156,7 @@ public class Jar
      * @param zipFile intended archive file (may or may not exist)
      * @return true if nothing need be done (may have done something already);
      *      false if archive creation should proceed
-     * @exception TaskException if it likes
+     * @exception org.apache.myrmidon.api.TaskException if it likes
      */
     protected boolean isUpToDate( FileScanner[] scanners, File zipFile )
         throws TaskException
@@ -314,7 +314,7 @@ public class Jar
      * http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index}
      *
      * @param zOut the zip stream representing the jar being built.
-     * @throws IOException thrown if there is an error while creating the index
+     * @throws java.io.IOException thrown if there is an error while creating the index
      *      and adding it to the zip stream.
      */
     private void createIndexList( ZipOutputStream zOut )
@@ -371,7 +371,7 @@ public class Jar
      * updating
      *
      * @param is Description of Parameter
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     private void zipManifestEntry( InputStream is )
         throws IOException, TaskException

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Tar.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -19,10 +19,10 @@ import org.apache.avalon.excalibur.io.IOUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.ScannerUtil;
+import org.apache.tools.todo.types.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.MergingMapper;
 
 /**
  * Creates a TAR archive.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarFileSet.java

@@ -5,9 +5,9 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
-import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.todo.types.FileSet;
 
 public class TarFileSet
     extends FileSet

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java

@@ -5,10 +5,10 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Valid Modes for LongFile attribute to Tar Task

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Untar.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -14,6 +14,7 @@ import org.apache.aut.tar.TarEntry;
 import org.apache.aut.tar.TarInputStream;
 import org.apache.avalon.excalibur.io.IOUtil;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.taskdefs.archive.Expand;
 
 /**
  * Untar a file. Heavily based on the Expand task.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Unzip.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Unzip.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,6 +15,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.apache.avalon.excalibur.io.IOUtil;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.taskdefs.archive.Expand;
 
 /**
  * Untar a file. Heavily based on the Expand task.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/War.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,6 +13,7 @@ import org.apache.aut.zip.ZipOutputStream;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
+import org.apache.tools.todo.taskdefs.archive.Jar;
 
 /**
  * Creates a WAR archive.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/WhenEmpty.java

@@ -5,9 +5,9 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Possible behaviors when there are no matching files for the task.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Zip.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.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,13 +26,14 @@ import org.apache.avalon.excalibur.io.IOUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.FileScanner;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.MergingMapper;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.taskdefs.archive.WhenEmpty;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileScanner;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.ScannerUtil;
+import org.apache.tools.todo.types.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.MergingMapper;
 
 /**
  * Create a ZIP archive.
@@ -436,7 +437,7 @@ public class Zip
      * @param zipFile intended archive file (may or may not exist)
      * @return true if nothing need be done (may have done something already);
      *      false if archive creation should proceed
-     * @exception TaskException if it likes
+     * @exception org.apache.myrmidon.api.TaskException if it likes
      */
     protected boolean isUpToDate( FileScanner[] scanners, File zipFile )
         throws TaskException
@@ -503,7 +504,7 @@ public class Zip
      * @param zOut The feature to be added to the Files attribute
      * @param prefix The feature to be added to the Files attribute
      * @param fullpath The feature to be added to the Files attribute
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected void addFiles( FileScanner scanner, ZipOutputStream zOut,
                              String prefix, String fullpath )
@@ -574,7 +575,7 @@ public class Zip
      *
      * @param filesets The feature to be added to the Files attribute
      * @param zOut The feature to be added to the Files attribute
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected void addFiles( ArrayList filesets, ZipOutputStream zOut )
         throws IOException, TaskException
@@ -640,7 +641,7 @@ public class Zip
      * @param entry The feature to be added to the ParentDirs attribute
      * @param zOut The feature to be added to the ParentDirs attribute
      * @param prefix The feature to be added to the ParentDirs attribute
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected void addParentDirs( File baseDir, String entry,
                                   ZipOutputStream zOut, String prefix )

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java

@@ -5,10 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
-import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.todo.types.FileSet;
 
 /**
  * A ZipFileSet is a FileSet with extra attributes useful in the context of

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipScanner.java

@@ -5,10 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.archive;
+package org.apache.tools.todo.taskdefs.archive;
 
 import java.io.File;
-import org.apache.tools.ant.types.DirectoryScanner;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 /**
  * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, which