diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml index 4fde74417..106d9a436 100644 --- a/proposal/myrmidon/build.xml +++ b/proposal/myrmidon/build.xml @@ -273,9 +273,9 @@ Legal: - + - + diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java index ba895d7af..d95c80734 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java index 1ead2e1bf..cf783cbc0 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java b/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java index d3390fcf4..8b7ebdcbb 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/Available.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java index 96b6f6138..77b73a352 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java index 873955384..3345fe693 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java b/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java index 377046ded..7caf116e4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java index 1be1ce2e3..0521b0438 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java index a2a61e6a5..6390a0b0e 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java index d8e217956..55700ff03 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java index 0a786e046..436a99d2f 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java b/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java index 3f316a10b..356ca87ad 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java index 29b6cef0e..2c10ee406 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java +++ b/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. diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/PathFileList.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/PathFileList.java index 12e0cc5fe..526350b63 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/PathFileList.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java index 27fe59cad..8974bc486 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/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; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index 918a88e97..eada08a7c 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/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 diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java index bd9fa3af2..fab3acdeb 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index b0d26eac7..4d7a2a4fc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index b84d42d83..d06e7f14f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java index 31952e596..93c9ebfc6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index e7425df71..612e1b2a1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java index bae47511f..651b8e7ca 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index 321afd462..f2ff8d14b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java index c2d50b330..8d837dbb4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/StyleBook.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java index db8c2bec6..1274db6f0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java +++ b/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); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index a938551ae..3b13e4bf0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java index a19dd3ff3..13714a381 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index f29a8a1b7..21acb436c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/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

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java index 39b76ed4e..40016a1d9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java index 21e0ef924..133e7aaba 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java index 9dd0119df..94aabe304 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java index f1fb2411c..8a924c2e2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index adde36042..5f8cd5d1f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 0d7d2d82b..625d04dc4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index ec4ac16c8..a9518c900 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index cf42e88ac..84f430312 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java index 85bca8801..c2bf54ccf 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index c12c6c22a..1cdb10dde 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 7f26c95ff..3af977396 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index a1ad8068f..e842c6ef9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/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 ) ) ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java index 0aa034f42..1f9399129 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java index 9e9c15286..5659e75e2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index b7aa31709..a66792447 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/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; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index 1e3ad0532..f4f42d9d0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/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; /** *

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java index 60b1b2a24..8d41877a3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java +++ b/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; /** *

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index fca57dce7..968ef3376 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/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.

@@ -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 ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 113afafa4..e001aff86 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 0548ecec9..7c3757cad 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java index 578629740..b13f0afcd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java index 9e08d81b9..f6623c76b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 3c9d28d12..1c468137f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index e5d4f273b..a50b46e0e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/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 Example Usage: diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index f1cc5af46..65ae85d97 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ 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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 7571e435d..0b4b1986e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/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 19-04-2001

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index f728d7b80..d9ec8cf22 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index 548bb1090..9f29f8655 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index 41e94e80e..61500cd17 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/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; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 027909a8a..41184dc2f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java index a76877477..588a25df2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java index e5c4b4ae0..ed98de54a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java index 3e401418b..eefa0e4f2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java index d4ce69407..47b8d5f37 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java +++ b/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 FileSet . diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 258324040..31b8e26a1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java index a0f86a8a3..c717a10c0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java index 5a85b9b32..d150d8b82 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java index 2df2b34bf..099d6092e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java index c2b4fe798..dc47c2ac0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java index b9d3811a4..43cce5d07 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java +++ b/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.

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/DependSet.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/DependSet.java index f2ea9985f..ee4ef4b01 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Echo.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Echo.java index 69a1c4368..3adcb2780 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ExecuteJava.java similarity index 92% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ExecuteJava.java index 95f5ec73d..3db6a880e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FileDir.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/FileDir.java similarity index 87% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FileDir.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/FileDir.java index 46885971d..bd3afb3e1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FileDir.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Get.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Get.java index 64454302d..a006fb615 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Java.java similarity index 92% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Java.java index d7408b199..239fd3793 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/MatchingTask.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/MatchingTask.java index 8fed26344..06c627fbd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/PathConvert.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/PathConvert.java index e47e4e1fe..5179f53c9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Property.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Property.java index 6d9f9e1ef..18e408d93 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Rpm.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Rpm.java index 169b462aa..602efb473 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/SQLExec.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/SQLExec.java index c478568a4..5e6847fcc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Tstamp.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/Tstamp.java index a52db7861..764d9bda3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/UpToDate.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/UpToDate.java index 53443f39c..f729eb334 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/WaitFor.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/WaitFor.java index 1fd1bc787..c2973dda0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Ear.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Ear.java index b8ba52f05..712c3fe33 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Ear.java +++ b/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; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Expand.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Expand.java index bbc06b597..be45d0d22 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Jar.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Jar.java index 1dfa651e2..355c730bb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Tar.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Tar.java index b5f9235d7..f5d5150bb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Tar.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarFileSet.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarFileSet.java index 3176342d6..8cbc4cfaf 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarFileSet.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java index c1631a424..0f728f481 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java +++ b/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 diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Untar.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Untar.java index ff3cea15a..09e814529 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Untar.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Unzip.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Unzip.java similarity index 93% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Unzip.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Unzip.java index d9af36b8e..0169e4969 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Unzip.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/War.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/War.java index 9881b7372..8d46391f1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/War.java +++ b/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. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/WhenEmpty.java similarity index 82% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/WhenEmpty.java index 0266efe13..f4717545c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java +++ b/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. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Zip.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/Zip.java index 9f609b5e7..b2a5eba4e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java +++ b/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 ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java index 3d2305e29..054a6a0a8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipScanner.java similarity index 96% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/archive/ZipScanner.java index 1528b94bb..01e65dbf9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/ZipScanner.java +++ b/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 diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Equals.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Equals.java similarity index 95% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Equals.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Equals.java index 808fa8a4e..6b43b2804 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Equals.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Equals.java @@ -1,3 +1,5 @@ +package org.apache.tools.todo.taskdefs.conditions; + /* * Copyright (C) The Apache Software Foundation. All rights reserved. * diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Http.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Http.java index 6d80f47b6..701a1d2bf 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Http.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.condition; +package org.apache.tools.todo.taskdefs.conditions; import java.net.HttpURLConnection; import java.net.MalformedURLException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Socket.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Socket.java index 40a055342..a93a49e3f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/conditions/Socket.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.condition; +package org.apache.tools.todo.taskdefs.conditions; import java.io.IOException; import org.apache.myrmidon.api.TaskContext; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.java similarity index 84% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.java index 20af4964c..33c1b9c57 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.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.exec; +package org.apache.tools.todo.taskdefs.exec; import java.io.IOException; import java.io.InputStream; @@ -25,7 +25,7 @@ public interface ExecuteStreamHandler * * @param os output stream to write to the standard input stream of the * subprocess - * @exception IOException Description of Exception + * @exception java.io.IOException Description of Exception */ void setProcessInputStream( OutputStream os ) throws IOException; @@ -34,7 +34,7 @@ public interface ExecuteStreamHandler * Install a handler for the error stream of the subprocess. * * @param is input stream to read from the error stream from the subprocess - * @exception IOException Description of Exception + * @exception java.io.IOException Description of Exception */ void setProcessErrorStream( InputStream is ) throws IOException; @@ -43,7 +43,7 @@ public interface ExecuteStreamHandler * Install a handler for the output stream of the subprocess. * * @param is input stream to read from the error stream from the subprocess - * @exception IOException Description of Exception + * @exception java.io.IOException Description of Exception */ void setProcessOutputStream( InputStream is ) throws TaskException, IOException; @@ -51,7 +51,7 @@ public interface ExecuteStreamHandler /** * Start handling of the streams. * - * @exception IOException Description of Exception + * @exception java.io.IOException Description of Exception */ void start() throws IOException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java index 6ad4e8f55..0b3b576f2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.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.compilers; +package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; @@ -38,7 +38,7 @@ public interface CompilerAdapter * Executes the task. * * @return has the compilation been successful - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ boolean execute() throws TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java index 792ad498e..6f1030bbc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.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.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.tools.todo.taskdefs.javac.CompilerAdapter; /** * Creates the necessary compiler adapter, given basic criteria. @@ -46,7 +47,7 @@ public class CompilerAdapterFactory * @param compilerType either the name of the desired compiler, or the full * classname of the compiler's adapter. * @return The Compiler value - * @throws TaskException if the compiler type could not be resolved into a + * @throws org.apache.myrmidon.api.TaskException if the compiler type could not be resolved into a * compiler adapter. */ public static CompilerAdapter getCompiler( String compilerType, @@ -123,7 +124,7 @@ public class CompilerAdapterFactory * * @param className The fully qualified classname to be created. * @return Description of the Returned Value - * @throws TaskException This is the fit that is thrown if className isn't + * @throws org.apache.myrmidon.api.TaskException This is the fit that is thrown if className isn't * an instance of CompilerAdapter. */ private static CompilerAdapter resolveClassName( String className ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java index 3f19cc5c6..95d124cd8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.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.compilers; +package org.apache.tools.todo.taskdefs.javac; import java.io.File; import java.io.FileWriter; @@ -17,10 +17,11 @@ import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; -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.util.FileUtils; +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.util.FileUtils; +import org.apache.tools.todo.taskdefs.javac.CompilerAdapter; /** * This is the default implementation for the CompilerAdapter interface. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Gcj.java similarity index 89% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Gcj.java index f7d1ed2a4..a5f95fca1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Gcj.java @@ -5,13 +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.compilers; +package org.apache.tools.todo.taskdefs.javac; 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; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the gcj compiler. This is primarily a cut-and-paste @@ -26,7 +27,7 @@ public class Gcj extends DefaultCompilerAdapter * Performs a compile using the gcj compiler. * * @return Description of the Returned Value - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception * @author tora@debian.org */ public boolean execute() diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.java index c7f0e1258..d637e3e0a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.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.compilers; +package org.apache.tools.todo.taskdefs.javac; -import org.apache.tools.ant.types.Argument; +import org.apache.tools.todo.types.Argument; /** * Adds an "implementation" attribute to Commandline$Attribute used to diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac.java index 8dd8b9055..4dda69f76 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac.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.compilers; +package org.apache.tools.todo.taskdefs.javac; import java.io.File; import java.util.ArrayList; @@ -15,11 +15,14 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.JavaVersion; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.DirectoryScanner; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.SourceFileScanner; -import org.apache.tools.ant.util.mappers.GlobPatternMapper; +import org.apache.tools.todo.taskdefs.MatchingTask; +import org.apache.tools.todo.taskdefs.javac.CompilerAdapter; +import org.apache.tools.todo.taskdefs.javac.CompilerAdapterFactory; +import org.apache.tools.todo.taskdefs.javac.ImplementationSpecificArgument; +import org.apache.tools.todo.types.DirectoryScanner; +import org.apache.tools.todo.types.Path; +import org.apache.tools.todo.types.SourceFileScanner; +import org.apache.tools.todo.util.mappers.GlobPatternMapper; /** * Task to compile Java source files. This task can take the following @@ -588,7 +591,7 @@ public class Javac /** * Executes the task. * - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public void execute() throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac12.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac12.java index 01881231a..fb4a0b966 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac12.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.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import java.io.OutputStream; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the javac compiler for JDK 1.2 This is primarily a diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac13.java similarity index 92% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac13.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac13.java index b4ab10871..aa4771b65 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac13.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Javac13.java @@ -5,12 +5,13 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the javac compiler for JDK 1.3 This is primarily a diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/JavacExternal.java similarity index 81% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/JavacExternal.java index 8acda1b26..475290d47 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/JavacExternal.java @@ -5,11 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * Performs a compile using javac externally. @@ -23,7 +24,7 @@ public class JavacExternal extends DefaultCompilerAdapter * Performs a compile using the Javac externally. * * @return Description of the Returned Value - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public boolean execute() throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jikes.java similarity index 92% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jikes.java index c448bc93f..622aa7565 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jikes.java @@ -5,13 +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.compilers; +package org.apache.tools.todo.taskdefs.javac; 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; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the jikes compiler. This is primarily a cut-and-paste @@ -35,7 +36,7 @@ public class Jikes * been successfully tested with jikes >1.10 * * @return Description of the Returned Value - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception * @author skanthak@muehlheim.de */ public boolean execute() diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jvc.java similarity index 92% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jvc.java index 1f1d851af..422974f8d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Jvc.java @@ -5,13 +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.compilers; +package org.apache.tools.todo.taskdefs.javac; 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; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the jvc compiler from microsoft. This is primarily a diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Kjc.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Kjc.java index f53bfd02b..c7a0cec7a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Kjc.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.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import java.lang.reflect.Method; 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; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the Java compiler for KJC. This is primarily a diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Sj.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Sj.java similarity index 81% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Sj.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Sj.java index 177f7faa5..1612304ce 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Sj.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javac/Sj.java @@ -5,11 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.compilers; +package org.apache.tools.todo.taskdefs.javac; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter; /** * The implementation of the sj compiler. Uses the defaults for @@ -24,7 +25,7 @@ public class Sj extends DefaultCompilerAdapter * Performs a compile using the sj compiler from Symantec. * * @return Description of the Returned Value - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception * @author don@bea.com */ public boolean execute() diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/AccessType.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/AccessType.java similarity index 84% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/AccessType.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/AccessType.java index 406c69730..54c44994c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/AccessType.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/AccessType.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; -import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.todo.types.EnumeratedAttribute; public class AccessType extends EnumeratedAttribute diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java index 9065822f4..9f3cbec4c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.javadoc; +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.ant.types.Path; +import org.apache.tools.todo.types.Path; public class DocletInfo { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletParam.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletParam.java index d3d2d295f..955a07ac9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/DocletParam.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; public class DocletParam { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.java index 25d1cd063..d66c6179c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; import java.util.ArrayList; import java.util.StringTokenizer; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Html.java similarity index 91% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Html.java index c81178f3f..c6ac22a4c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Html.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; public class Html { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java similarity index 97% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java index a93dd0e9e..d19846993 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/Javadoc.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; import java.io.File; import java.io.FileWriter; @@ -23,12 +23,17 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Pattern; -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.Path; -import org.apache.tools.ant.types.ScannerUtil; -import org.apache.tools.ant.util.FileUtils; +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.tools.todo.types.ScannerUtil; +import org.apache.tools.todo.util.FileUtils; +import org.apache.tools.todo.taskdefs.javadoc.AccessType; +import org.apache.tools.todo.taskdefs.javadoc.DocletInfo; +import org.apache.tools.todo.taskdefs.javadoc.DocletParam; +import org.apache.tools.todo.taskdefs.javadoc.GroupArgument; +import org.apache.tools.todo.taskdefs.javadoc.Html; /** * This task makes it easy to generate Javadoc documentation for a collection of diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.java index 971dcbe28..cb7969199 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; import java.io.File; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/PackageName.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/PackageName.java similarity index 91% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/PackageName.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/PackageName.java index c60363131..672615e5d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/PackageName.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/PackageName.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; public class PackageName { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/SourceFile.java similarity index 90% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/SourceFile.java index 33a377306..45c1bc319 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javadoc/SourceFile.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.javadoc; +package org.apache.tools.todo.taskdefs.javadoc; import java.io.File; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Attribute.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Attribute.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Attribute.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Attribute.java index a891f62ae..c8744ae5e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Attribute.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Attribute.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; /** * Class to hold manifest attributes diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Manifest.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Manifest.java index 39fc5a113..4b2fdbafd 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Manifest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Manifest.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; import java.util.Collection; import java.util.Enumeration; @@ -97,7 +97,7 @@ public class Manifest * Merge the contents of the given manifest into this manifest * * @param other the Manifest to be merged with this one. - * @throws ManifestException if there is a problem merging the manfest + * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if there is a problem merging the manfest * according to the Manifest spec. */ public void merge( final Manifest other ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestException.java similarity index 96% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestException.java index fc5a9f0f4..30ee6567d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestException.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestException.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; /** * ManifestException is thrown when there is a problem parsing, generating or diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestMode.java similarity index 86% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestMode.java index a551bd1ef..2d03de74e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestMode.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; -import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.todo.types.EnumeratedAttribute; /** * Helper class for Manifest's mode attribute. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java similarity index 95% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java index 400fd87dd..5b7b7c3c7 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestTask.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; import java.io.File; import java.io.FileReader; @@ -17,6 +17,8 @@ import java.util.Iterator; 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.manifest.Manifest; +import org.apache.tools.todo.taskdefs.manifest.Section; /** * Class to manage Manifest information @@ -119,7 +121,7 @@ public class ManifestTask /** * Create or update the Manifest when used as a task. * - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public void execute() throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java similarity index 95% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java index eb22f9993..7756908ef 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; import java.io.BufferedReader; import java.io.IOException; @@ -15,6 +15,9 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.UnsupportedEncodingException; import java.util.jar.Attributes; +import org.apache.tools.todo.taskdefs.manifest.Manifest; +import org.apache.tools.todo.taskdefs.manifest.Section; +import org.apache.tools.todo.taskdefs.manifest.Attribute; /** * Utility methods for manifest stuff. @@ -153,7 +156,7 @@ public final class ManifestUtil * Parse a line into name and value pairs * * @param line the line to be parsed - * @throws ManifestException if the line does not contain a colon + * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the line does not contain a colon * separating the name and value */ public static void parse( final Attribute attribute, final String line ) @@ -201,7 +204,7 @@ public final class ManifestUtil * Write the manifest out to a print writer. * * @param writer the Writer to which the manifest is written - * @throws IOException if the manifest cannot be written + * @throws java.io.IOException if the manifest cannot be written */ public static void write( Manifest manifest, PrintWriter writer ) throws IOException diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Section.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Section.java similarity index 95% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Section.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Section.java index 2213a6b71..7c76919a8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Section.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/Section.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.manifest; +package org.apache.tools.todo.taskdefs.manifest; import java.io.BufferedReader; import java.io.IOException; @@ -103,7 +103,7 @@ public class Section * @param attribute the attribute to be added. * @return the value of the attribute if it is a name attribute - null * other wise - * @throws ManifestException if the attribute already exists in this + * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the attribute already exists in this * section. */ public String addAttributeAndCheck( Attribute attribute ) @@ -194,7 +194,7 @@ public class Section * Merge in another section * * @param section the section to be merged with this one. - * @throws ManifestException if the sections cannot be merged. + * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the sections cannot be merged. */ public void merge( Section section ) throws ManifestException @@ -239,9 +239,9 @@ public class Section * @param reader the reader from which the section is read * @return the name of the next section if it has been read as part of * this section - This only happens if the Manifest is malformed. - * @throws ManifestException if the section is not valid according to + * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the section is not valid according to * the JAR spec - * @throws IOException if the section cannot be read from the reader. + * @throws java.io.IOException if the section cannot be read from the reader. */ public String read( BufferedReader reader ) throws ManifestException, IOException @@ -301,7 +301,7 @@ public class Section * Write the section out to a print writer. * * @param writer the Writer to which the section is written - * @throws IOException if the section cannot be written + * @throws java.io.IOException if the section cannot be written */ public void write( PrintWriter writer ) throws IOException diff --git a/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/default.mf b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/default.mf new file mode 100644 index 000000000..1dc733da7 --- /dev/null +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/manifest/default.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Created-By: Apache Ant @VERSION@ + diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java index b2780f6e5..d409bc50a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.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.rmic; +package org.apache.tools.todo.taskdefs.rmic; import java.io.File; import java.util.ArrayList; @@ -13,9 +13,9 @@ import java.util.Random; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; -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; /** * This is the default implementation for the RmicAdapter interface. Currently, diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java similarity index 92% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java index 8d71c91b2..cc6925c49 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java @@ -5,13 +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.rmic; +package org.apache.tools.todo.taskdefs.rmic; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /** * The implementation of the rmic for Kaffe diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/Rmic.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/Rmic.java index 0afc764ca..46f28cbf5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/Rmic.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.rmic; +package org.apache.tools.todo.taskdefs.rmic; import java.io.File; import java.io.IOException; @@ -18,11 +18,11 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.FileNameMapper; -import org.apache.tools.ant.taskdefs.MatchingTask; -import org.apache.tools.ant.types.DirectoryScanner; -import org.apache.tools.ant.types.Path; -import org.apache.tools.ant.types.PathUtil; -import org.apache.tools.ant.types.SourceFileScanner; +import org.apache.tools.todo.taskdefs.MatchingTask; +import org.apache.tools.todo.types.DirectoryScanner; +import org.apache.tools.todo.types.Path; +import org.apache.tools.todo.types.PathUtil; +import org.apache.tools.todo.types.SourceFileScanner; /** * Task to compile RMI stubs and skeletons. This task can take the following diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java similarity index 88% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java index 92ee4aa12..3a0a4d9a9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java @@ -5,12 +5,13 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.rmic; +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.ant.types.Path; +import org.apache.tools.todo.types.Path; +import org.apache.tools.todo.taskdefs.rmic.Rmic; /** * The interface that all rmic adapters must adher to.

@@ -39,7 +40,7 @@ public interface RmicAdapter * Executes the task. * * @return has the compilation been successful - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ boolean execute() throws TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java index 016b8a409..41f58cb93 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java @@ -5,10 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.rmic; +package org.apache.tools.todo.taskdefs.rmic; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.tools.todo.taskdefs.rmic.KaffeRmic; +import org.apache.tools.todo.taskdefs.rmic.RmicAdapter; /** * Creates the necessary rmic adapter, given basic criteria. @@ -40,7 +42,7 @@ public class RmicAdapterFactory * @param rmicType either the name of the desired rmic, or the full * classname of the rmic's adapter. * @return The Rmic value - * @throws TaskException if the rmic type could not be resolved into a rmic + * @throws org.apache.myrmidon.api.TaskException if the rmic type could not be resolved into a rmic * adapter. */ public static RmicAdapter getRmic( final String rmicType, final TaskContext context ) @@ -100,7 +102,7 @@ public class RmicAdapterFactory * * @param className The fully qualified classname to be created. * @return Description of the Returned Value - * @throws TaskException This is the fit that is thrown if className isn't + * @throws org.apache.myrmidon.api.TaskException This is the fit that is thrown if className isn't * an instance of RmicAdapter. */ private static RmicAdapter resolveClassName( String className ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/SunRmic.java similarity index 93% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/SunRmic.java index fcb36afec..3bf027272 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/SunRmic.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.rmic; +package org.apache.tools.todo.taskdefs.rmic; import java.io.IOException; import java.io.OutputStream; @@ -13,7 +13,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /** * The implementation of the rmic for SUN's JDK. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/WLRmic.java similarity index 93% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/WLRmic.java index 95530c81e..c58a6096d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/WLRmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/rmic/WLRmic.java @@ -5,12 +5,13 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.rmic; +package org.apache.tools.todo.taskdefs.rmic; import java.lang.reflect.Method; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.ant.types.Commandline; +import org.apache.tools.todo.types.Commandline; +import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter; /** * The implementation of the rmic for WebLogic diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/AddAsisRemove.java similarity index 83% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/AddAsisRemove.java index 755666dad..82937c9c5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/AddAsisRemove.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.text; +package org.apache.tools.todo.taskdefs.text; -import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.todo.types.EnumeratedAttribute; /** * Enumerated attribute with the values "asis", "add" and "remove". diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/CrLf.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/CrLf.java similarity index 83% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/CrLf.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/CrLf.java index f19cfab98..221874a3d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/CrLf.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/CrLf.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.text; +package org.apache.tools.todo.taskdefs.text; -import org.apache.tools.ant.types.EnumeratedAttribute; +import org.apache.tools.todo.types.EnumeratedAttribute; /** * Enumerated attribute with the values "asis", "cr", "lf" and "crlf". diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/FixCRLF.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/FixCRLF.java index 9a6962e4c..5266db92c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/FixCRLF.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.text; +package org.apache.tools.todo.taskdefs.text; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -26,8 +26,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.todo.taskdefs.MatchingTask; +import org.apache.tools.todo.taskdefs.text.AddAsisRemove; +import org.apache.tools.todo.taskdefs.text.CrLf; +import org.apache.tools.todo.types.DirectoryScanner; /** * Task to convert text source files to local OS formatting conventions, as well @@ -267,7 +269,7 @@ public class FixCRLF * Specify tab length in characters * * @param tlength specify the length of tab in spaces, - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public void setTablength( int tlength ) throws TaskException @@ -288,7 +290,7 @@ public class FixCRLF /** * Executes the task. * - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public void execute() throws TaskException @@ -343,7 +345,7 @@ public class FixCRLF * * @param f Description of Parameter * @return The Reader value - * @exception IOException Description of Exception + * @exception java.io.IOException Description of Exception */ private Reader getReader( File f ) throws IOException @@ -359,7 +361,7 @@ public class FixCRLF * * @param bufline Description of Parameter * @param terminator Description of Parameter - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ private void endOfCharConst( OneLiner.BufferLine bufline, char terminator ) throws TaskException @@ -395,7 +397,7 @@ public class FixCRLF * next eol character. * * @param bufline Description of Parameter - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ private void nextStateChange( OneLiner.BufferLine bufline ) throws TaskException diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Native2Ascii.java similarity index 94% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Native2Ascii.java index 50569ab4b..6ed1ca1ae 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Native2Ascii.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Native2Ascii.java @@ -5,18 +5,18 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.taskdefs.text; +package org.apache.tools.todo.taskdefs.text; 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.myrmidon.framework.FileNameMapper; -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.SourceFileScanner; -import org.apache.tools.ant.util.mappers.IdentityMapper; +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.SourceFileScanner; +import org.apache.tools.todo.util.mappers.IdentityMapper; /** * Convert files from native encodings to ascii. @@ -164,7 +164,7 @@ public class Native2Ascii * * @param srcName Description of Parameter * @param destName Description of Parameter - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ private void convert( String srcName, String destName ) throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/NestedString.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/NestedString.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/NestedString.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/NestedString.java index 15bbf7351..32165ece9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/NestedString.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/NestedString.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.text; +package org.apache.tools.todo.taskdefs.text; public class NestedString { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/RegularExpression.java similarity index 91% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/RegularExpression.java index 41041a0c8..3b12fca26 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/RegularExpression.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/RegularExpression.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.ant.taskdefs.text; +package org.apache.tools.todo.taskdefs.text; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.util.regexp.Regexp; -import org.apache.tools.ant.util.regexp.RegexpFactory; +import org.apache.tools.todo.util.regexp.Regexp; +import org.apache.tools.todo.util.regexp.RegexpFactory; /** * A regular expression datatype. Keeps an instance of the compiled expression @@ -38,7 +38,7 @@ import org.apache.tools.ant.util.regexp.RegexpFactory; * @see org.apache.oro.regex.Perl5Compiler * @see org.apache.regexp.RE * @see java.util.regex.Pattern - * @see org.apache.tools.ant.util.regexp.Regexp + * @see org.apache.tools.todo.util.regexp.Regexp */ public class RegularExpression { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replace.java similarity index 95% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replace.java index 2003aa1b5..188602618 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replace.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.text; +package org.apache.tools.todo.taskdefs.text; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -27,8 +27,9 @@ 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.taskdefs.text.NestedString; +import org.apache.tools.todo.types.DirectoryScanner; /** * Replaces all occurrences of one or more string tokens with given values in @@ -194,7 +195,7 @@ public class Replace /** * Do the execution. * - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ public void execute() throws TaskException @@ -236,7 +237,7 @@ public class Replace /** * Validate attributes provided for this task in .xml build file. * - * @exception TaskException if any supplied attribute is invalid or any + * @exception org.apache.myrmidon.api.TaskException if any supplied attribute is invalid or any * mandatory attribute is missing */ public void validateAttributes() @@ -268,7 +269,7 @@ public class Replace /** * Validate nested elements. * - * @exception TaskException if any supplied attribute is invalid or any + * @exception org.apache.myrmidon.api.TaskException if any supplied attribute is invalid or any * mandatory attribute is missing */ public void validateReplacefilters() @@ -286,7 +287,7 @@ public class Replace * on a temporary file which then replaces the original file. * * @param src the source file - * @exception TaskException Description of Exception + * @exception org.apache.myrmidon.api.TaskException Description of Exception */ private void processFile( File src ) throws TaskException diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java similarity index 97% rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java index b568e675b..e911cf62b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.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.text; +package org.apache.tools.todo.taskdefs.text; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -19,10 +19,11 @@ import java.util.ArrayList; 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.ant.util.regexp.Regexp; +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.util.regexp.Regexp; +import org.apache.tools.todo.taskdefs.text.RegularExpression; /** * 

@@ -281,7 +282,7 @@ public class ReplaceRegExp
      *
      * @param f Description of Parameter
      * @param options Description of Parameter
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected void doReplace( File f, int options )
         throws IOException, TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replacefilter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replacefilter.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replacefilter.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replacefilter.java
index 2825f5aa3..00759abac 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replacefilter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Replacefilter.java
@@ -5,9 +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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.taskdefs.text.Replace;
 
 public class Replacefilter
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Substitution.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Substitution.java
index 01a125ee1..d7b315a8c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Substitution.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/text/Substitution.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 /**
  * A regular expression substitution datatype. It is an expression that is meant
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Argument.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Argument.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Argument.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/Argument.java
index 86c7ea495..f3f381d73 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Argument.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Argument.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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Used for nested xml command line definitions.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Commandline.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/Commandline.java
index 2e55f81ec..3bd6c698b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Commandline.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Commandline.java
@@ -5,13 +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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.types.Argument;
 
 /**
  * Commandline objects help handling command lines specifying processes to
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/CommandlineJava.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/CommandlineJava.java
index 020cc76e2..35e0e7961 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/CommandlineJava.java
@@ -5,12 +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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.aut.nativelib.Os;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A representation of a Java command line that is nothing more than a composite
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/DirectoryScanner.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/DirectoryScanner.java
index d426431f3..45117aa12 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/DirectoryScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnumeratedAttribute.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/EnumeratedAttribute.java
index f2fe1bc9b..919a9e5f9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnumeratedAttribute.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnumeratedAttribute.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.types;
+package org.apache.tools.todo.types;
 
 import org.apache.myrmidon.api.TaskException;
 
@@ -26,7 +26,7 @@ public abstract class EnumeratedAttribute
      * IntrospectionHelper}.
      *
      * @param value The new Value value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public final void setValue( final String value )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentData.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentData.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentData.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentData.java
index a43b0f5aa..d14bde470 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentData.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentData.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.types;
+package org.apache.tools.todo.types;
 
 import java.util.ArrayList;
 import java.util.Properties;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentVariable.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentVariable.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentVariable.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentVariable.java
index f389dc3e1..bfe5439a3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/EnvironmentVariable.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/EnvironmentVariable.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/FileList.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/FileList.java
index a985a442a..9b762e5ab 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/FileScanner.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/FileScanner.java
index 205f6ec39..29bb12c5d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/FileScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/FileSet.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/FileSet.java
index 21f9aee9c..d81545427 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/FileSet.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.types;
+package org.apache.tools.todo.types;
 
 /**
  * Moved out of MatchingTask to make it a standalone object that could be
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Path.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/Path.java
index fa0209054..ea254bbf7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Path.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/Path.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.DataType;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
 
 /**
  * This object represents a path as used by CLASSPATH or PATH environment
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/PathElement.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/PathElement.java
index dd6317e65..e2be50975 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathElement.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/PathElement.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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Helper class, holds <> values.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/PathUtil.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/PathUtil.java
index 98cdfc135..ba683e97e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathUtil.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/PathUtil.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Locale;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Utilities for operating on Path objects.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/ScannerUtil.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/ScannerUtil.java
index 273bc5eff..4ba81346f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ScannerUtil.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/ScannerUtil.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,9 +13,12 @@ import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.PatternUtil;
-import org.apache.tools.ant.taskdefs.archive.TarFileSet;
-import org.apache.tools.ant.taskdefs.archive.ZipFileSet;
-import org.apache.tools.ant.taskdefs.archive.ZipScanner;
+import org.apache.tools.todo.taskdefs.archive.TarFileSet;
+import org.apache.tools.todo.taskdefs.archive.ZipFileSet;
+import org.apache.tools.todo.taskdefs.archive.ZipScanner;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileScanner;
+import org.apache.tools.todo.types.FileSet;
 
 /**
  *
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/SourceFileScanner.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/SourceFileScanner.java
index d7751aebe..6b3b3a6e0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/SourceFileScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/SysProperties.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/SysProperties.java
index b3712a118..bd7c61dcc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SysProperties.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/SysProperties.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.aut.nativelib.ExecException;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.EnvironmentData;
+import org.apache.tools.todo.types.EnvironmentVariable;
 
 /**
  * Specialized EnvironmentData class for System properties
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/types/converters/StringToPathConverter.java
similarity index 89%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/types/converters/StringToPathConverter.java
index 63984cc75..403e1609b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/types/converters/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.ant.types.converters;
+package org.apache.tools.todo.types.converters;
 
 import org.apache.aut.converter.AbstractConverter;
 import org.apache.aut.converter.ConverterException;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
 
 /**
  * A converter from String to Path.
@@ -33,7 +33,7 @@ public class StringToPathConverter
      * @param original the original Object
      * @param context the context in which to convert
      * @return the converted object
-     * @exception Exception if an error occurs
+     * @exception java.lang.Exception if an error occurs
      */
     protected Object convert( Object original, Object context )
         throws ConverterException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/FileUtils.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/FileUtils.java
index 49f294114..2b7ab4e57 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/FileUtils.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.util;
+package org.apache.tools.todo.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,7 +13,8 @@ import java.util.Stack;
 import java.util.StringTokenizer;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.util.PathTokenizer;
 
 /**
  * This class also encapsulates methods which allow Files to be refered to using
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/PathTokenizer.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/PathTokenizer.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/PathTokenizer.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/PathTokenizer.java
index 44c78b2f2..e00b87490 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/PathTokenizer.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/PathTokenizer.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.util;
+package org.apache.tools.todo.util;
 
 import java.io.File;
 import java.util.NoSuchElementException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Dependencies.java
similarity index 99%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Dependencies.java
index 2e8aae531..b4fa1daec 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Dependencies.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Dependencies.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.util.depend;
+package org.apache.tools.todo.util.depend;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Filter.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Filter.java
similarity index 88%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Filter.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Filter.java
index cfee359dc..d66601388 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Filter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/depend/Filter.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.util.depend;
+package org.apache.tools.todo.util.depend;
 
 public interface Filter
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
index 117ca96c7..ebbd3e92d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/GlobPatternMapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/GlobPatternMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/IdentityMapper.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/IdentityMapper.java
index e3ada4441..5f82165ee 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/IdentityMapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/IdentityMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/MergingMapper.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/MergingMapper.java
index d5bf1185e..690d0208d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/MergingMapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/MergingMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
index f77e9e76a..ad3e2d3a8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/mappers/RegexpPatternMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.FileNameMapper;
-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;
 
 /**
  * Implementation of FileNameMapper that does regular expression replacements.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroMatcher.java
similarity index 90%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroMatcher.java
index b7f798bf4..fe7493511 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -49,7 +49,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -66,7 +66,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String input, int options )
         throws TaskException
@@ -100,7 +100,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -114,7 +114,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
@@ -128,7 +128,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param options Description of Parameter
      * @return The CompiledPattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     protected Pattern getCompiledPattern( int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
index 75401a646..7e0a8d588 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
@@ -5,12 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.oro.text.regex.Perl5Substitution;
 import org.apache.oro.text.regex.Substitution;
 import org.apache.oro.text.regex.Util;
+import org.apache.tools.todo.util.regexp.JakartaOroMatcher;
 
 /**
  * Regular expression implementation using the Jakarta Oro package
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.java
similarity index 92%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.java
index 14b2bc26c..f2a93b2cf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -42,7 +42,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -82,7 +82,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -96,7 +96,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
index a5f3d6c31..e2053afb7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.regexp.RE;
+import org.apache.tools.todo.util.regexp.JakartaRegexpMatcher;
 
 /**
  * Regular expression implementation using the Jakarta Regexp package
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.java
similarity index 91%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.java
index f9c085fe7..38ab56ba0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -47,7 +47,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -64,7 +64,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String input, int options )
         throws TaskException
@@ -99,7 +99,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -113,7 +113,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
index d73cbe3bd..e98a2a83e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.Jdk14RegexpMatcher;
 
 /**
  * Regular expression implementation using the JDK 1.4 regular expression
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Regexp.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Regexp.java
similarity index 90%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Regexp.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Regexp.java
index 64e8350fd..cf6db2a98 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Regexp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/Regexp.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
 
@@ -36,7 +36,7 @@ public interface Regexp
      * @param options The list of options for the match and replace. See the
      *      MATCH_ and REPLACE_ constants above.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     String substitute( String input, String argument, int options )
         throws TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpFactory.java
similarity index 93%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpFactory.java
index 7669f18ee..b1c2ece8c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpFactory.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpFactory.java
@@ -5,9 +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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.Regexp;
 
 /**
  * Regular expression factory, which will create Regexp objects. The actual
@@ -69,7 +70,7 @@ public class RegexpFactory
      *
      * @param classname Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      * @since 1.3
      */
     private Regexp createRegexpInstance( final String classname )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcher.java
similarity index 84%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcher.java
index 489e80c56..680c876de 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -44,7 +44,7 @@ public interface RegexpMatcher
      * Set the regexp pattern from the String description.
      *
      * @param pattern The new Pattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     void setPattern( String pattern )
         throws TaskException;
@@ -53,7 +53,7 @@ public interface RegexpMatcher
      * Get a String representation of the regexp pattern
      *
      * @return The Pattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     String getPattern()
         throws TaskException;
@@ -63,7 +63,7 @@ public interface RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean matches( String argument )
         throws TaskException;
@@ -76,7 +76,7 @@ public interface RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     ArrayList getGroups( String argument )
         throws TaskException;
@@ -88,7 +88,7 @@ public interface RegexpMatcher
      * @param options The list of options for the match. See the MATCH_
      *      constants above.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean matches( String input, int options )
         throws TaskException;
@@ -101,7 +101,7 @@ public interface RegexpMatcher
      * @param options The list of options for the match. See the MATCH_
      *      constants above.
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     ArrayList getGroups( String input, int options )
         throws TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
similarity index 93%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
index 50f480ab2..36b7bebf0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
@@ -5,9 +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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.RegexpMatcher;
 
 /**
  * Simple Factory Class that produces an implementation of RegexpMatcher based
@@ -30,7 +31,7 @@ public class RegexpMatcherFactory
      *
      * @param p Project whose ant.regexp.regexpimpl property will be used.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public RegexpMatcher newRegexpMatcher()
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpUtil.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
rename to proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpUtil.java
index 83c56037a..fe3ebb631 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/RegexpUtil.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/todo/util/regexp/RegexpUtil.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 /**
  * Regular expression utilities class which handles flag operations
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index b0d26eac7..4d7a2a4fc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
index b84d42d83..d06e7f14f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java
index 31952e596..93c9ebfc6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Entry.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
index e7425df71..612e1b2a1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/todo/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 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
index bae47511f..651b8e7ca 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
index 321afd462..f2ff8d14b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
index c2d50b330..8d837dbb4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/StyleBook.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
index db8c2bec6..1274db6f0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java
+++ b/proposal/myrmidon/src/todo/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);
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
index a938551ae..3b13e4bf0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
index a19dd3ff3..13714a381 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
index f29a8a1b7..21acb436c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
+++ b/proposal/myrmidon/src/todo/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 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
index 39b76ed4e..40016a1d9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
index 21e0ef924..133e7aaba 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
index 9dd0119df..94aabe304 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
index f1fb2411c..8a924c2e2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index adde36042..5f8cd5d1f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index 0d7d2d82b..625d04dc4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index ec4ac16c8..a9518c900 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index cf42e88ac..84f430312 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java
index 85bca8801..c2bf54ccf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index c12c6c22a..1cdb10dde 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 7f26c95ff..3af977396 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index a1ad8068f..e842c6ef9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/proposal/myrmidon/src/todo/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 ) ) )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java
index 0aa034f42..1f9399129 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
index 9e9c15286..5659e75e2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index b7aa31709..a66792447 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/proposal/myrmidon/src/todo/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;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
index 1e3ad0532..f4f42d9d0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
+++ b/proposal/myrmidon/src/todo/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;
 
 /**
  * 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
index 60b1b2a24..8d41877a3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
+++ b/proposal/myrmidon/src/todo/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;
 
 /**
  * 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index fca57dce7..968ef3376 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/proposal/myrmidon/src/todo/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. 

@@ -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 )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index 113afafa4..e001aff86 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/proposal/myrmidon/src/todo/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;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
index 0548ecec9..7c3757cad 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
index 578629740..b13f0afcd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
index 9e08d81b9..f6623c76b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
index 3c9d28d12..1c468137f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
+++ b/proposal/myrmidon/src/todo/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;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
index e5d4f273b..a50b46e0e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
+++ b/proposal/myrmidon/src/todo/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 Example Usage:
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index f1cc5af46..65ae85d97 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
index 7571e435d..0b4b1986e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
+++ b/proposal/myrmidon/src/todo/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 19-04-2001 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
index f728d7b80..d9ec8cf22 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
index 548bb1090..9f29f8655 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index 41e94e80e..61500cd17 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/proposal/myrmidon/src/todo/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;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 027909a8a..41184dc2f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java
index a76877477..588a25df2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java
index e5c4b4ae0..ed98de54a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java
index 3e401418b..eefa0e4f2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java
index d4ce69407..47b8d5f37 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java
+++ b/proposal/myrmidon/src/todo/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 FileSet .
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 258324040..31b8e26a1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
index a0f86a8a3..c717a10c0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
index 5a85b9b32..d150d8b82 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
index 2df2b34bf..099d6092e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
index c2b4fe798..dc47c2ac0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
index b9d3811a4..43cce5d07 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.java
+++ b/proposal/myrmidon/src/todo/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. 

diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java
index f2ea9985f..ee4ef4b01 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Echo.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Echo.java
index 69a1c4368..3adcb2780 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java
similarity index 92%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ExecuteJava.java
index 95f5ec73d..3db6a880e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FileDir.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/FileDir.java
similarity index 87%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FileDir.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/FileDir.java
index 46885971d..bd3afb3e1 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FileDir.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Get.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Get.java
index 64454302d..a006fb615 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java
similarity index 92%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Java.java
index d7408b199..239fd3793 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java
index 8fed26344..06c627fbd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/PathConvert.java
index e47e4e1fe..5179f53c9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Property.java
index 6d9f9e1ef..18e408d93 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Rpm.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Rpm.java
index 169b462aa..602efb473 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java
index c478568a4..5e6847fcc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Tstamp.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Tstamp.java
index a52db7861..764d9bda3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/UpToDate.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/UpToDate.java
index 53443f39c..f729eb334 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/WaitFor.java
index 1fd1bc787..c2973dda0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Ear.java
index b8ba52f05..712c3fe33 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java
+++ b/proposal/myrmidon/src/todo/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;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java
index bbc06b597..be45d0d22 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Expand.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Jar.java
index 1dfa651e2..355c730bb 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Jar.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java
index b5f9235d7..f5d5150bb 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java
index 3176342d6..8cbc4cfaf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarFileSet.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarLongFileMode.java
index c1631a424..0f728f481 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/TarLongFileMode.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java
index ff3cea15a..09e814529 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Untar.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Unzip.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Unzip.java
similarity index 93%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Unzip.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Unzip.java
index d9af36b8e..0169e4969 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Unzip.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/War.java
index 9881b7372..8d46391f1 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/WhenEmpty.java
similarity index 82%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/WhenEmpty.java
index 0266efe13..f4717545c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/WhenEmpty.java
+++ b/proposal/myrmidon/src/todo/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.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java
index 9f609b5e7..b2a5eba4e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/archive/Zip.java
+++ b/proposal/myrmidon/src/todo/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 )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java
index 3d2305e29..054a6a0a8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipFileSet.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipScanner.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipScanner.java
index 1528b94bb..01e65dbf9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/ZipScanner.java
+++ b/proposal/myrmidon/src/todo/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
index 808fa8a4e..6b43b2804 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Equals.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Equals.java
@@ -1,3 +1,5 @@
+package org.apache.tools.todo.taskdefs.conditions;
+
 /*
  * Copyright (C) The Apache Software Foundation. All rights reserved.
  *
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Http.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Http.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.java
index 6d80f47b6..701a1d2bf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Http.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.condition;
+package org.apache.tools.todo.taskdefs.conditions;
 
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Socket.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Socket.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.java
index 40a055342..a93a49e3f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/condition/Socket.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/conditions/Socket.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.condition;
+package org.apache.tools.todo.taskdefs.conditions;
 
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskContext;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.java
similarity index 84%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.java
index 20af4964c..33c1b9c57 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecuteStreamHandler.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/exec/ExecuteStreamHandler.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.exec;
+package org.apache.tools.todo.taskdefs.exec;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,7 +25,7 @@ public interface ExecuteStreamHandler
      *
      * @param os output stream to write to the standard input stream of the
      *      subprocess
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     void setProcessInputStream( OutputStream os )
         throws IOException;
@@ -34,7 +34,7 @@ public interface ExecuteStreamHandler
      * Install a handler for the error stream of the subprocess.
      *
      * @param is input stream to read from the error stream from the subprocess
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     void setProcessErrorStream( InputStream is )
         throws IOException;
@@ -43,7 +43,7 @@ public interface ExecuteStreamHandler
      * Install a handler for the output stream of the subprocess.
      *
      * @param is input stream to read from the error stream from the subprocess
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     void setProcessOutputStream( InputStream is )
         throws TaskException, IOException;
@@ -51,7 +51,7 @@ public interface ExecuteStreamHandler
     /**
      * Start handling of the streams.
      *
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     void start()
         throws IOException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.java
index 6ad4e8f55..0b3b576f2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapter.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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
@@ -38,7 +38,7 @@ public interface CompilerAdapter
      * Executes the task.
      *
      * @return has the compilation been successful
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean execute()
         throws TaskException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.java
index 792ad498e..6f1030bbc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/CompilerAdapterFactory.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.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.taskdefs.javac.CompilerAdapter;
 
 /**
  * Creates the necessary compiler adapter, given basic criteria.
@@ -46,7 +47,7 @@ public class CompilerAdapterFactory
      * @param compilerType either the name of the desired compiler, or the full
      *      classname of the compiler's adapter.
      * @return The Compiler value
-     * @throws TaskException if the compiler type could not be resolved into a
+     * @throws org.apache.myrmidon.api.TaskException if the compiler type could not be resolved into a
      *      compiler adapter.
      */
     public static CompilerAdapter getCompiler( String compilerType,
@@ -123,7 +124,7 @@ public class CompilerAdapterFactory
      *
      * @param className The fully qualified classname to be created.
      * @return Description of the Returned Value
-     * @throws TaskException This is the fit that is thrown if className isn't
+     * @throws org.apache.myrmidon.api.TaskException This is the fit that is thrown if className isn't
      *      an instance of CompilerAdapter.
      */
     private static CompilerAdapter resolveClassName( String className )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java
index 3f19cc5c6..95d124cd8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -17,10 +17,11 @@ import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-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.util.FileUtils;
+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.util.FileUtils;
+import org.apache.tools.todo.taskdefs.javac.CompilerAdapter;
 
 /**
  * This is the default implementation for the CompilerAdapter interface.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java
similarity index 89%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java
index f7d1ed2a4..a5f95fca1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Gcj.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Gcj.java
@@ -5,13 +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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 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;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the gcj compiler. This is primarily a cut-and-paste
@@ -26,7 +27,7 @@ public class Gcj extends DefaultCompilerAdapter
      * Performs a compile using the gcj compiler.
      *
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      * @author tora@debian.org
      */
     public boolean execute()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.java
index c7f0e1258..d637e3e0a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/ImplementationSpecificArgument.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/ImplementationSpecificArgument.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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
-import org.apache.tools.ant.types.Argument;
+import org.apache.tools.todo.types.Argument;
 
 /**
  * Adds an "implementation" attribute to Commandline$Attribute used to
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.java
index 8dd8b9055..4dda69f76 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac.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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -15,11 +15,14 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.JavaVersion;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.GlobPatternMapper;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.taskdefs.javac.CompilerAdapter;
+import org.apache.tools.todo.taskdefs.javac.CompilerAdapterFactory;
+import org.apache.tools.todo.taskdefs.javac.ImplementationSpecificArgument;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.GlobPatternMapper;
 
 /**
  * Task to compile Java source files. This task can take the following
@@ -588,7 +591,7 @@ public class Javac
     /**
      * Executes the task.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac12.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac12.java
index 01881231a..fb4a0b966 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac12.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.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the javac compiler for JDK 1.2 This is primarily a
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java
similarity index 92%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java
index b4ab10871..aa4771b65 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Javac13.java
@@ -5,12 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import java.lang.reflect.Method;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the javac compiler for JDK 1.3 This is primarily a
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/JavacExternal.java
similarity index 81%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/JavacExternal.java
index 8acda1b26..475290d47 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/JavacExternal.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * Performs a compile using javac externally.
@@ -23,7 +24,7 @@ public class JavacExternal extends DefaultCompilerAdapter
      * Performs a compile using the Javac externally.
      *
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean execute()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java
similarity index 92%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java
index c448bc93f..622aa7565 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jikes.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jikes.java
@@ -5,13 +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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 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;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the jikes compiler. This is primarily a cut-and-paste
@@ -35,7 +36,7 @@ public class Jikes
      * been successfully tested with jikes >1.10
      *
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      * @author skanthak@muehlheim.de
      */
     public boolean execute()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java
similarity index 92%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java
index 1f1d851af..422974f8d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Jvc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Jvc.java
@@ -5,13 +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.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 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;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the jvc compiler from microsoft. This is primarily a
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.java
index f53bfd02b..c7a0cec7a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Kjc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Kjc.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.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import java.lang.reflect.Method;
 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;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the Java compiler for KJC. This is primarily a
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Sj.java
similarity index 81%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Sj.java
index 177f7faa5..1612304ce 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Sj.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/Sj.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.compilers;
+package org.apache.tools.todo.taskdefs.javac;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
 
 /**
  * The implementation of the sj compiler. Uses the defaults for
@@ -24,7 +25,7 @@ public class Sj extends DefaultCompilerAdapter
      * Performs a compile using the sj compiler from Symantec.
      *
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      * @author don@bea.com
      */
     public boolean execute()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/AccessType.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/AccessType.java
similarity index 84%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/AccessType.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/AccessType.java
index 406c69730..54c44994c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/AccessType.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/AccessType.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 public class AccessType
     extends EnumeratedAttribute
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java
index 9065822f4..9f3cbec4c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/DocletInfo.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletInfo.java
@@ -5,12 +5,12 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.javadoc;
+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.ant.types.Path;
+import org.apache.tools.todo.types.Path;
 
 public class DocletInfo
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletParam.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletParam.java
index d3d2d295f..955a07ac9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/DocletParam.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/DocletParam.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 public class DocletParam
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.java
index 25d1cd063..d66c6179c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/GroupArgument.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Html.java
similarity index 91%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Html.java
index c81178f3f..c6ac22a4c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Html.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 public class Html
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java
index a93dd0e9e..d19846993 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -23,12 +23,17 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.myrmidon.framework.Pattern;
-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.Path;
-import org.apache.tools.ant.types.ScannerUtil;
-import org.apache.tools.ant.util.FileUtils;
+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.tools.todo.types.ScannerUtil;
+import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.taskdefs.javadoc.AccessType;
+import org.apache.tools.todo.taskdefs.javadoc.DocletInfo;
+import org.apache.tools.todo.taskdefs.javadoc.DocletParam;
+import org.apache.tools.todo.taskdefs.javadoc.GroupArgument;
+import org.apache.tools.todo.taskdefs.javadoc.Html;
 
 /**
  * This task makes it easy to generate Javadoc documentation for a collection of
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.java
index 971dcbe28..cb7969199 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/LinkArgument.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/LinkArgument.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 import java.io.File;
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/PackageName.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/PackageName.java
similarity index 91%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/PackageName.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/PackageName.java
index c60363131..672615e5d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/PackageName.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/PackageName.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 public class PackageName
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/SourceFile.java
similarity index 90%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/SourceFile.java
index 33a377306..45c1bc319 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/SourceFile.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/SourceFile.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.javadoc;
+package org.apache.tools.todo.taskdefs.javadoc;
 
 import java.io.File;
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Attribute.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Attribute.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Attribute.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Attribute.java
index a891f62ae..c8744ae5e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Attribute.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Attribute.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 /**
  * Class to hold manifest attributes
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Manifest.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Manifest.java
index 39fc5a113..4b2fdbafd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/Manifest.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Manifest.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 import java.util.Collection;
 import java.util.Enumeration;
@@ -97,7 +97,7 @@ public class Manifest
      * Merge the contents of the given manifest into this manifest
      *
      * @param other the Manifest to be merged with this one.
-     * @throws ManifestException if there is a problem merging the manfest
+     * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if there is a problem merging the manfest
      *      according to the Manifest spec.
      */
     public void merge( final Manifest other )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestException.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestException.java
index fc5a9f0f4..30ee6567d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestException.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestException.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 /**
  * ManifestException is thrown when there is a problem parsing, generating or
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestMode.java
similarity index 86%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestMode.java
index a551bd1ef..2d03de74e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/ManifestMode.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestMode.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Helper class for Manifest's mode attribute.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestTask.java
index 400fd87dd..5b7b7c3c7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestTask.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 import java.io.File;
 import java.io.FileReader;
@@ -17,6 +17,8 @@ import java.util.Iterator;
 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.manifest.Manifest;
+import org.apache.tools.todo.taskdefs.manifest.Section;
 
 /**
  * Class to manage Manifest information
@@ -119,7 +121,7 @@ public class ManifestTask
     /**
      * Create or update the Manifest when used as a task.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.java
index eb22f9993..7756908ef 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/manifest/ManifestUtil.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/ManifestUtil.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -15,6 +15,9 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.util.jar.Attributes;
+import org.apache.tools.todo.taskdefs.manifest.Manifest;
+import org.apache.tools.todo.taskdefs.manifest.Section;
+import org.apache.tools.todo.taskdefs.manifest.Attribute;
 
 /**
  * Utility methods for manifest stuff.
@@ -153,7 +156,7 @@ public final class ManifestUtil
      * Parse a line into name and value pairs
      *
      * @param line the line to be parsed
-     * @throws ManifestException if the line does not contain a colon
+     * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the line does not contain a colon
      *      separating the name and value
      */
     public static void parse( final Attribute attribute, final String line )
@@ -201,7 +204,7 @@ public final class ManifestUtil
      * Write the manifest out to a print writer.
      *
      * @param writer the Writer to which the manifest is written
-     * @throws IOException if the manifest cannot be written
+     * @throws java.io.IOException if the manifest cannot be written
      */
     public static void write( Manifest manifest, PrintWriter writer )
         throws IOException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Section.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Section.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Section.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Section.java
index 2213a6b71..7c76919a8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/manifest/Section.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/Section.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.manifest;
+package org.apache.tools.todo.taskdefs.manifest;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -103,7 +103,7 @@ public class Section
      * @param attribute the attribute to be added.
      * @return the value of the attribute if it is a name attribute - null
      *      other wise
-     * @throws ManifestException if the attribute already exists in this
+     * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the attribute already exists in this
      *      section.
      */
     public String addAttributeAndCheck( Attribute attribute )
@@ -194,7 +194,7 @@ public class Section
      * Merge in another section
      *
      * @param section the section to be merged with this one.
-     * @throws ManifestException if the sections cannot be merged.
+     * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the sections cannot be merged.
      */
     public void merge( Section section )
         throws ManifestException
@@ -239,9 +239,9 @@ public class Section
      * @param reader the reader from which the section is read
      * @return the name of the next section if it has been read as part of
      *      this section - This only happens if the Manifest is malformed.
-     * @throws ManifestException if the section is not valid according to
+     * @throws org.apache.tools.todo.taskdefs.manifest.ManifestException if the section is not valid according to
      *      the JAR spec
-     * @throws IOException if the section cannot be read from the reader.
+     * @throws java.io.IOException if the section cannot be read from the reader.
      */
     public String read( BufferedReader reader )
         throws ManifestException, IOException
@@ -301,7 +301,7 @@ public class Section
      * Write the section out to a print writer.
      *
      * @param writer the Writer to which the section is written
-     * @throws IOException if the section cannot be written
+     * @throws java.io.IOException if the section cannot be written
      */
     public void write( PrintWriter writer )
         throws IOException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/default.mf b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/default.mf
new file mode 100644
index 000000000..1dc733da7
--- /dev/null
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/manifest/default.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: Apache Ant @VERSION@
+
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.java
index b2780f6e5..d409bc50a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/DefaultRmicAdapter.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.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,9 +13,9 @@ import java.util.Random;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.FileNameMapper;
-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;
 
 /**
  * This is the default implementation for the RmicAdapter interface. Currently,
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java
similarity index 92%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java
index 8d71c91b2..cc6925c49 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/KaffeRmic.java
@@ -5,13 +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.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter;
 
 /**
  * The implementation of the rmic for Kaffe
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.java
index 0afc764ca..46f28cbf5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/Rmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/Rmic.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.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,11 +18,11 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.DirectoryScanner;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PathUtil;
-import org.apache.tools.ant.types.SourceFileScanner;
+import org.apache.tools.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.types.PathUtil;
+import org.apache.tools.todo.types.SourceFileScanner;
 
 /**
  * Task to compile RMI stubs and skeletons. This task can take the following
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java
similarity index 88%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java
index 92ee4aa12..3a0a4d9a9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapter.java
@@ -5,12 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.rmic;
+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.ant.types.Path;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.taskdefs.rmic.Rmic;
 
 /**
  * The interface that all rmic adapters must adher to. 

@@ -39,7 +40,7 @@ public interface RmicAdapter
      * Executes the task.
      *
      * @return has the compilation been successful
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean execute()
         throws TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java
index 016b8a409..41f58cb93 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/RmicAdapterFactory.java
@@ -5,10 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
+import org.apache.tools.todo.taskdefs.rmic.KaffeRmic;
+import org.apache.tools.todo.taskdefs.rmic.RmicAdapter;
 
 /**
  * Creates the necessary rmic adapter, given basic criteria.
@@ -40,7 +42,7 @@ public class RmicAdapterFactory
      * @param rmicType either the name of the desired rmic, or the full
      *      classname of the rmic's adapter.
      * @return The Rmic value
-     * @throws TaskException if the rmic type could not be resolved into a rmic
+     * @throws org.apache.myrmidon.api.TaskException if the rmic type could not be resolved into a rmic
      *      adapter.
      */
     public static RmicAdapter getRmic( final String rmicType, final TaskContext context )
@@ -100,7 +102,7 @@ public class RmicAdapterFactory
      *
      * @param className The fully qualified classname to be created.
      * @return Description of the Returned Value
-     * @throws TaskException This is the fit that is thrown if className isn't
+     * @throws org.apache.myrmidon.api.TaskException This is the fit that is thrown if className isn't
      *      an instance of RmicAdapter.
      */
     private static RmicAdapter resolveClassName( String className )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/SunRmic.java
similarity index 93%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/SunRmic.java
index fcb36afec..3bf027272 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/SunRmic.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.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -13,7 +13,8 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter;
 
 /**
  * The implementation of the rmic for SUN's JDK.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/WLRmic.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/WLRmic.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/WLRmic.java
index 95530c81e..c58a6096d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/WLRmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/rmic/WLRmic.java
@@ -5,12 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.rmic;
+package org.apache.tools.todo.taskdefs.rmic;
 
 import java.lang.reflect.Method;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.todo.types.Commandline;
+import org.apache.tools.todo.taskdefs.rmic.DefaultRmicAdapter;
 
 /**
  * The implementation of the rmic for WebLogic
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/AddAsisRemove.java
similarity index 83%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/AddAsisRemove.java
index 755666dad..82937c9c5 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/AddAsisRemove.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/AddAsisRemove.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Enumerated attribute with the values "asis", "add" and "remove".
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/CrLf.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/CrLf.java
similarity index 83%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/CrLf.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/CrLf.java
index f19cfab98..221874a3d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/CrLf.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/CrLf.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
-import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.todo.types.EnumeratedAttribute;
 
 /**
  * Enumerated attribute with the values "asis", "cr", "lf" and "crlf".
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.java
index 9a6962e4c..5266db92c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/FixCRLF.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -26,8 +26,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.todo.taskdefs.MatchingTask;
+import org.apache.tools.todo.taskdefs.text.AddAsisRemove;
+import org.apache.tools.todo.taskdefs.text.CrLf;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 /**
  * Task to convert text source files to local OS formatting conventions, as well
@@ -267,7 +269,7 @@ public class FixCRLF
      * Specify tab length in characters
      *
      * @param tlength specify the length of tab in spaces,
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void setTablength( int tlength )
         throws TaskException
@@ -288,7 +290,7 @@ public class FixCRLF
     /**
      * Executes the task.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
@@ -343,7 +345,7 @@ public class FixCRLF
      *
      * @param f Description of Parameter
      * @return The Reader value
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     private Reader getReader( File f )
         throws IOException
@@ -359,7 +361,7 @@ public class FixCRLF
      *
      * @param bufline Description of Parameter
      * @param terminator Description of Parameter
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void endOfCharConst( OneLiner.BufferLine bufline, char terminator )
         throws TaskException
@@ -395,7 +397,7 @@ public class FixCRLF
      * next eol character.
      *
      * @param bufline Description of Parameter
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void nextStateChange( OneLiner.BufferLine bufline )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Native2Ascii.java
similarity index 94%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Native2Ascii.java
index 50569ab4b..6ed1ca1ae 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Native2Ascii.java
@@ -5,18 +5,18 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.text;
+package org.apache.tools.todo.taskdefs.text;
 
 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.myrmidon.framework.FileNameMapper;
-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.SourceFileScanner;
-import org.apache.tools.ant.util.mappers.IdentityMapper;
+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.SourceFileScanner;
+import org.apache.tools.todo.util.mappers.IdentityMapper;
 
 /**
  * Convert files from native encodings to ascii.
@@ -164,7 +164,7 @@ public class Native2Ascii
      *
      * @param srcName Description of Parameter
      * @param destName Description of Parameter
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void convert( String srcName, String destName )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/NestedString.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/NestedString.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/NestedString.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/NestedString.java
index 15bbf7351..32165ece9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/NestedString.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/NestedString.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 public class NestedString
 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/RegularExpression.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/RegularExpression.java
index 41041a0c8..3b12fca26 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/RegularExpression.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/RegularExpression.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.ant.taskdefs.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.regexp.Regexp;
-import org.apache.tools.ant.util.regexp.RegexpFactory;
+import org.apache.tools.todo.util.regexp.Regexp;
+import org.apache.tools.todo.util.regexp.RegexpFactory;
 
 /**
  * A regular expression datatype. Keeps an instance of the compiled expression
@@ -38,7 +38,7 @@ import org.apache.tools.ant.util.regexp.RegexpFactory;
  * @see org.apache.oro.regex.Perl5Compiler
  * @see org.apache.regexp.RE
  * @see java.util.regex.Pattern
- * @see org.apache.tools.ant.util.regexp.Regexp
+ * @see org.apache.tools.todo.util.regexp.Regexp
  */
 public class RegularExpression
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replace.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replace.java
index 2003aa1b5..188602618 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replace.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -27,8 +27,9 @@ 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.taskdefs.text.NestedString;
+import org.apache.tools.todo.types.DirectoryScanner;
 
 /**
  * Replaces all occurrences of one or more string tokens with given values in
@@ -194,7 +195,7 @@ public class Replace
     /**
      * Do the execution.
      *
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public void execute()
         throws TaskException
@@ -236,7 +237,7 @@ public class Replace
     /**
      * Validate attributes provided for this task in .xml build file.
      *
-     * @exception TaskException if any supplied attribute is invalid or any
+     * @exception org.apache.myrmidon.api.TaskException if any supplied attribute is invalid or any
      *      mandatory attribute is missing
      */
     public void validateAttributes()
@@ -268,7 +269,7 @@ public class Replace
     /**
      * Validate nested elements.
      *
-     * @exception TaskException if any supplied attribute is invalid or any
+     * @exception org.apache.myrmidon.api.TaskException if any supplied attribute is invalid or any
      *      mandatory attribute is missing
      */
     public void validateReplacefilters()
@@ -286,7 +287,7 @@ public class Replace
      * on a temporary file which then replaces the original file.
      *
      * @param src the source file
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     private void processFile( File src )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java
index b568e675b..e911cf62b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -19,10 +19,11 @@ import java.util.ArrayList;
 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.ant.util.regexp.Regexp;
+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.util.regexp.Regexp;
+import org.apache.tools.todo.taskdefs.text.RegularExpression;
 
 /**
  * 
@@ -281,7 +282,7 @@ public class ReplaceRegExp
      *
      * @param f Description of Parameter
      * @param options Description of Parameter
-     * @exception IOException Description of Exception
+     * @exception java.io.IOException Description of Exception
      */
     protected void doReplace( File f, int options )
         throws IOException, TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replacefilter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replacefilter.java
similarity index 96%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replacefilter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replacefilter.java
index 2825f5aa3..00759abac 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replacefilter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Replacefilter.java
@@ -5,9 +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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.taskdefs.text.Replace;
 
 public class Replacefilter
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Substitution.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Substitution.java
index 01a125ee1..d7b315a8c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Substitution.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/Substitution.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.text;
+package org.apache.tools.todo.taskdefs.text;
 
 /**
  * A regular expression substitution datatype. It is an expression that is meant
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Argument.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/Argument.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.java
index 86c7ea495..f3f381d73 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Argument.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Argument.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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Used for nested xml command line definitions.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Commandline.java
similarity index 97%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/Commandline.java
index 2e55f81ec..3bd6c698b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Commandline.java
@@ -5,13 +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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.types.Argument;
 
 /**
  * Commandline objects help handling command lines specifying processes to
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/CommandlineJava.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/CommandlineJava.java
index 020cc76e2..35e0e7961 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/CommandlineJava.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/CommandlineJava.java
@@ -5,12 +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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.aut.nativelib.Os;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.Argument;
+import org.apache.tools.todo.types.Commandline;
 
 /**
  * A representation of a Java command line that is nothing more than a composite
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/DirectoryScanner.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/DirectoryScanner.java
index d426431f3..45117aa12 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/DirectoryScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnumeratedAttribute.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnumeratedAttribute.java
similarity index 94%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnumeratedAttribute.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnumeratedAttribute.java
index f2fe1bc9b..919a9e5f9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnumeratedAttribute.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnumeratedAttribute.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.types;
+package org.apache.tools.todo.types;
 
 import org.apache.myrmidon.api.TaskException;
 
@@ -26,7 +26,7 @@ public abstract class EnumeratedAttribute
      * IntrospectionHelper}.
      *
      * @param value The new Value value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public final void setValue( final String value )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentData.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentData.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentData.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentData.java
index a43b0f5aa..d14bde470 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentData.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentData.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.types;
+package org.apache.tools.todo.types;
 
 import java.util.ArrayList;
 import java.util.Properties;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentVariable.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentVariable.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.java
index f389dc3e1..bfe5439a3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/EnvironmentVariable.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/EnvironmentVariable.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileList.java
index a985a442a..9b762e5ab 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileScanner.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileScanner.java
index 205f6ec39..29bb12c5d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java
index 21f9aee9c..d81545427 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.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.types;
+package org.apache.tools.todo.types;
 
 /**
  * Moved out of MatchingTask to make it a standalone object that could be
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java
similarity index 97%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java
index fa0209054..ea254bbf7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Path.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/Path.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.DataType;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileSet;
 
 /**
  * This object represents a path as used by CLASSPATH or PATH environment
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathElement.java
similarity index 91%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathElement.java
index dd6317e65..e2be50975 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/PathElement.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathElement.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.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
+import org.apache.tools.todo.util.FileUtils;
 
 /**
  * Helper class, holds <> values.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java
index 98cdfc135..ba683e97e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/PathUtil.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/PathUtil.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Locale;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.FileSet;
+import org.apache.tools.todo.types.Path;
 
 /**
  * Utilities for operating on Path objects.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
index 273bc5eff..4ba81346f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ScannerUtil.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,9 +13,12 @@ import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.PatternUtil;
-import org.apache.tools.ant.taskdefs.archive.TarFileSet;
-import org.apache.tools.ant.taskdefs.archive.ZipFileSet;
-import org.apache.tools.ant.taskdefs.archive.ZipScanner;
+import org.apache.tools.todo.taskdefs.archive.TarFileSet;
+import org.apache.tools.todo.taskdefs.archive.ZipFileSet;
+import org.apache.tools.todo.taskdefs.archive.ZipScanner;
+import org.apache.tools.todo.types.DirectoryScanner;
+import org.apache.tools.todo.types.FileScanner;
+import org.apache.tools.todo.types.FileSet;
 
 /**
  *
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/SourceFileScanner.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/SourceFileScanner.java
index d7751aebe..6b3b3a6e0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/SourceFileScanner.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.types;
+package org.apache.tools.todo.types;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/SysProperties.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/SysProperties.java
index b3712a118..bd7c61dcc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/SysProperties.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/SysProperties.java
@@ -5,13 +5,15 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.types;
+package org.apache.tools.todo.types;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.aut.nativelib.ExecException;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.types.EnvironmentData;
+import org.apache.tools.todo.types.EnvironmentVariable;
 
 /**
  * Specialized EnvironmentData class for System properties
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java
similarity index 89%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/StringToPathConverter.java
index 63984cc75..403e1609b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/converters/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.ant.types.converters;
+package org.apache.tools.todo.types.converters;
 
 import org.apache.aut.converter.AbstractConverter;
 import org.apache.aut.converter.ConverterException;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
 
 /**
  * A converter from String to Path.
@@ -33,7 +33,7 @@ public class StringToPathConverter
      * @param original the original Object
      * @param context the context in which to convert
      * @return the converted object
-     * @exception Exception if an error occurs
+     * @exception java.lang.Exception if an error occurs
      */
     protected Object convert( Object original, Object context )
         throws ConverterException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/FileUtils.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/FileUtils.java
index 49f294114..2b7ab4e57 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileUtils.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/FileUtils.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.util;
+package org.apache.tools.todo.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -13,7 +13,8 @@ import java.util.Stack;
 import java.util.StringTokenizer;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.todo.types.Path;
+import org.apache.tools.todo.util.PathTokenizer;
 
 /**
  * This class also encapsulates methods which allow Files to be refered to using
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/PathTokenizer.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/PathTokenizer.java
similarity index 98%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/PathTokenizer.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/PathTokenizer.java
index 44c78b2f2..e00b87490 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/PathTokenizer.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/PathTokenizer.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.util;
+package org.apache.tools.todo.util;
 
 import java.io.File;
 import java.util.NoSuchElementException;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Dependencies.java
similarity index 99%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Dependencies.java
index 2e8aae531..b4fa1daec 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/depend/Dependencies.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Dependencies.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.util.depend;
+package org.apache.tools.todo.util.depend;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Filter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Filter.java
similarity index 88%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Filter.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Filter.java
index cfee359dc..d66601388 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/depend/Filter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/depend/Filter.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.util.depend;
+package org.apache.tools.todo.util.depend;
 
 public interface Filter
 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
similarity index 98%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.java
index 117ca96c7..ebbd3e92d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/GlobPatternMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/GlobPatternMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.java
index e3ada4441..5f82165ee 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/mappers/IdentityMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/IdentityMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.FileNameMapper;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.java
index d5bf1185e..690d0208d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/MergingMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/MergingMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
similarity index 95%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.java
index f77e9e76a..ad3e2d3a8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/mappers/RegexpPatternMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/mappers/RegexpPatternMapper.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.util.mappers;
+package org.apache.tools.todo.util.mappers;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.FileNameMapper;
-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;
 
 /**
  * Implementation of FileNameMapper that does regular expression replacements.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroMatcher.java
similarity index 90%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroMatcher.java
index b7f798bf4..fe7493511 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -49,7 +49,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -66,7 +66,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String input, int options )
         throws TaskException
@@ -100,7 +100,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -114,7 +114,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
@@ -128,7 +128,7 @@ public class JakartaOroMatcher implements RegexpMatcher
      *
      * @param options Description of Parameter
      * @return The CompiledPattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     protected Pattern getCompiledPattern( int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
index 75401a646..7e0a8d588 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaOroRegexp.java
@@ -5,12 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.oro.text.regex.Perl5Substitution;
 import org.apache.oro.text.regex.Substitution;
 import org.apache.oro.text.regex.Util;
+import org.apache.tools.todo.util.regexp.JakartaOroMatcher;
 
 /**
  * Regular expression implementation using the Jakarta Oro package
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.java
similarity index 92%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.java
index 14b2bc26c..f2a93b2cf 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -42,7 +42,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -82,7 +82,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -96,7 +96,7 @@ public class JakartaRegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
similarity index 95%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
index a5f3d6c31..e2053afb7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/JakartaRegexpRegexp.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.regexp.RE;
+import org.apache.tools.todo.util.regexp.JakartaRegexpMatcher;
 
 /**
  * Regular expression implementation using the Jakarta Regexp package
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.java
similarity index 91%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.java
index f9c085fe7..38ab56ba0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -47,7 +47,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String argument )
         throws TaskException
@@ -64,7 +64,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public ArrayList getGroups( String input, int options )
         throws TaskException
@@ -99,7 +99,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String argument )
         throws TaskException
@@ -113,7 +113,7 @@ public class Jdk14RegexpMatcher implements RegexpMatcher
      * @param input Description of Parameter
      * @param options Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public boolean matches( String input, int options )
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
similarity index 96%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
index d73cbe3bd..e98a2a83e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Jdk14RegexpRegexp.java
@@ -5,11 +5,12 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.Jdk14RegexpMatcher;
 
 /**
  * Regular expression implementation using the JDK 1.4 regular expression
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Regexp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Regexp.java
similarity index 90%
rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Regexp.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Regexp.java
index 64e8350fd..cf6db2a98 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/regexp/Regexp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/Regexp.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
 
@@ -36,7 +36,7 @@ public interface Regexp
      * @param options The list of options for the match and replace. See the
      *      MATCH_ and REPLACE_ constants above.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     String substitute( String input, String argument, int options )
         throws TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpFactory.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpFactory.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpFactory.java
index 7669f18ee..b1c2ece8c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpFactory.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpFactory.java
@@ -5,9 +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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.Regexp;
 
 /**
  * Regular expression factory, which will create Regexp objects. The actual
@@ -69,7 +70,7 @@ public class RegexpFactory
      *
      * @param classname Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      * @since 1.3
      */
     private Regexp createRegexpInstance( final String classname )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcher.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcher.java
similarity index 84%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcher.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcher.java
index 489e80c56..680c876de 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcher.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcher.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
@@ -44,7 +44,7 @@ public interface RegexpMatcher
      * Set the regexp pattern from the String description.
      *
      * @param pattern The new Pattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     void setPattern( String pattern )
         throws TaskException;
@@ -53,7 +53,7 @@ public interface RegexpMatcher
      * Get a String representation of the regexp pattern
      *
      * @return The Pattern value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     String getPattern()
         throws TaskException;
@@ -63,7 +63,7 @@ public interface RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean matches( String argument )
         throws TaskException;
@@ -76,7 +76,7 @@ public interface RegexpMatcher
      *
      * @param argument Description of Parameter
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     ArrayList getGroups( String argument )
         throws TaskException;
@@ -88,7 +88,7 @@ public interface RegexpMatcher
      * @param options The list of options for the match. See the MATCH_
      *      constants above.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     boolean matches( String input, int options )
         throws TaskException;
@@ -101,7 +101,7 @@ public interface RegexpMatcher
      * @param options The list of options for the match. See the MATCH_
      *      constants above.
      * @return The Groups value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     ArrayList getGroups( String input, int options )
         throws TaskException;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
similarity index 93%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
index 50f480ab2..36b7bebf0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpMatcherFactory.java
@@ -5,9 +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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 import org.apache.myrmidon.api.TaskException;
+import org.apache.tools.todo.util.regexp.RegexpMatcher;
 
 /**
  * Simple Factory Class that produces an implementation of RegexpMatcher based
@@ -30,7 +31,7 @@ public class RegexpMatcherFactory
      *
      * @param p Project whose ant.regexp.regexpimpl property will be used.
      * @return Description of the Returned Value
-     * @exception TaskException Description of Exception
+     * @exception org.apache.myrmidon.api.TaskException Description of Exception
      */
     public RegexpMatcher newRegexpMatcher()
         throws TaskException
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpUtil.java
similarity index 94%
rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpUtil.java
rename to proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpUtil.java
index 83c56037a..fe3ebb631 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/regexp/RegexpUtil.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/util/regexp/RegexpUtil.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.util.regexp;
+package org.apache.tools.todo.util.regexp;
 
 /**
  * Regular expression utilities class which handles flag operations