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

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

proposal/myrmidon/build.xml

@@ -274,6 +274,7 @@ Legal:
         </patternset>
 
         <property name="ant.package" value="org/apache/tools/todo"/>
+        <property name="taskdef.package" value="${ant.package}/taskdefs"/>
         <property name="antlib.package" value="org/apache/antlib"/>
         <property name="optional.package" value="org/apache/tools/ant/taskdefs/optional"/>
         <property name="optional.type.package" value="${ant.package}/types/optional"/>
@@ -305,65 +306,43 @@ Legal:
                      unless="trax.present" />
             <exclude name="${antlib.package}/xml/XalanLiaison.java"
                      unless="xalan.present" />
-            <exclude name="${optional.package}/ejb/Ejbc*.java"
-                     unless="ejb.ejbc.present" />
-            <exclude name="${optional.package}/ejb/DDCreator*.java"
-                     unless="ejb.DDCreator.present" />
-            <exclude name="${optional.package}/ejb/WLRun.java"
-                     unless="ejb.wls.present" />
-            <exclude name="${optional.package}/ejb/WLStop.java"
-                     unless="ejb.wls.present" />
-            <exclude name="${optional.package}/ejb/EjbJar.java"
-                     unless="ejbjar.support" />
-            <exclude name="${optional.package}/ejb/*DeploymentTool.java"
-                     unless="ejbjar.support" />
-            <exclude name="${optional.package}/ejb/IPlanet*.java"
-                     unless="ejbjar.support" />
             <exclude name="${optional.package}/Javah.java"
                      unless="jdk1.2+" />
-            <exclude name="${optional.package}/junit/*"
+            <exclude name="${taskdef.package}/junit/*"
                      unless="junit.present" />
-            <exclude name="${optional.package}/net/**.java"
+            <exclude name="${taskdef.package}/net/**.java"
                      unless="netcomp.present" />
-            <exclude name="${optional.package}/net/MimeMail.java"
+            <exclude name="${taskdef.package}/net/MimeMail.java"
                      unless="javamail.complete" />
-            <exclude name="${optional.package}/scm/AntStarTeam*.java"
+            <exclude name="${taskdef.package}/scm/AntStarTeam*.java"
                      unless="starteam.present" />
             <exclude name="${optional.package}/ANTLR.java"
                      unless="antlr.present" />
-            <exclude name="${optional.package}/ide/VAJ*.java"
-                     unless="vaj.present" />
-            <exclude name="${optional.package}/ide/VAJ*Servlet.java"
-                     unless="servlet.present" />
-            <exclude name="${optional.package}/perforce/*.java"
+            <exclude name="${taskdef.package}/perforce/*.java"
                      unless="jakarta.oro.present" />
-            <exclude name="${optional.package}/sound/*.java"
-                     unless="jmf.present" />
-            <exclude name="${optional.package}/junit/XMLResultAggregator.java"
+            <exclude name="${taskdef.package}/junit/XMLResultAggregator.java"
                      unless="trax.present" />
-            <exclude name="${optional.package}/junit/AggregateTransformer.java"
+            <exclude name="${taskdef.package}/junit/AggregateTransformer.java"
                      unless="trax.present" />
-            <exclude name="${optional.package}/junit/XMLResultAggregator.java"
+            <exclude name="${taskdef.package}/junit/XMLResultAggregator.java"
                      unless="xalan2.present" />
-            <exclude name="${optional.package}/junit/AggregateTransformer.java"
+            <exclude name="${taskdef.package}/junit/AggregateTransformer.java"
                      unless="xalan2.present" />
-            <exclude name="${optional.package}/junit/XalanExecutor.java"
+            <exclude name="${taskdef.package}/junit/XalanExecutor.java"
                      unless="xalan2.present" />
-            <exclude name="${optional.package}/junit/Xalan2Executor.java"
+            <exclude name="${taskdef.package}/junit/Xalan2Executor.java"
                      unless="xalan2.present" />
-            <exclude name="${optional.package}/junit/Xalan1Executor.java"
+            <exclude name="${taskdef.package}/junit/Xalan1Executor.java"
                      unless="xalan.present" />
-            <exclude name="${optional.package}/jdepend/*"
+            <exclude name="${taskdef.package}/jdepend/*"
                      unless="jdepend.present" />
-            <exclude name="${optional.package}/sitraka/**"
+            <exclude name="${taskdef.package}/sitraka/**"
                      unless="some.regexp.support"/>
-            <exclude name="${optional.package}/metamata/MAudit*"
+            <exclude name="${taskdef.package}/metamata/MAudit*"
                      unless="jakarta.oro.present"/>
-            <exclude name="${optional.package}/metamata/MMetrics*"
+            <exclude name="${taskdef.package}/metamata/MMetrics*"
                      unless="trax.present"/>
-            <exclude name="${optional.package}/metamata/**"
-                     unless="jdk1.2+" />
-            <exclude name="${optional.package}/ManifestFile.java"
+            <exclude name="${taskdef.package}/metamata/**"
                      unless="jdk1.2+" />
             <exclude name="${optional.type.package}/depend/*.java"
                      unless="bcel.present" />

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMCheck.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMCheckin.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 import java.util.Date;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMCheckinDefault.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 /**
  * Task to perform Checkin Default task command to Continuus

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMCheckout.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 /**
  * Task to perform Checkout command to Continuus

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMCreateTask.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.myrmidon.api.TaskException;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/CCMReconfigure.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.types.Commandline;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/ccm/Continuus.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.optional.ccm;
+package org.apache.tools.todo.taskdefs.ccm;
 
 import java.io.File;
 import org.apache.aut.nativelib.ExecManager;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/clearcase/CCCheckin.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.optional.clearcase;
+package org.apache.tools.todo.taskdefs.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.types.Commandline;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/clearcase/CCCheckout.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.optional.clearcase;
+package org.apache.tools.todo.taskdefs.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.types.Commandline;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/clearcase/CCUnCheckout.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.optional.clearcase;
+package org.apache.tools.todo.taskdefs.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.types.Commandline;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/clearcase/CCUpdate.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.optional.clearcase;
+package org.apache.tools.todo.taskdefs.clearcase;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.todo.types.Commandline;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/clearcase/ClearCase.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.optional.clearcase;
+package org.apache.tools.todo.taskdefs.clearcase;
 
 import java.io.File;
 import org.apache.aut.nativelib.ExecManager;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/i18n/Translate.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.optional.i18n;
+package org.apache.tools.todo.taskdefs.i18n;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javacc/JJTree.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.optional.javacc;
+package org.apache.tools.todo.taskdefs.javacc;
 
 import java.io.File;
 import java.util.Enumeration;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/javacc/JavaCC.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.optional.javacc;
+package org.apache.tools.todo.taskdefs.javacc;
 
 import java.io.File;
 import java.util.Enumeration;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/FormatAttribute.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jdepend/FormatAttribute.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.optional.jdepend;
+package org.apache.tools.todo.taskdefs.jdepend;
 
 import org.apache.tools.todo.types.EnumeratedAttribute;
 

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

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jsp/JspC.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.optional.jsp;
+package org.apache.tools.todo.taskdefs.jsp;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -14,8 +14,8 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 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.todo.taskdefs.jsp.compilers.CompilerAdapter;
+import org.apache.tools.todo.taskdefs.jsp.compilers.CompilerAdapterFactory;
 import org.apache.tools.todo.types.DirectoryScanner;
 import org.apache.tools.todo.types.Path;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jsp/WLJspc.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.optional.jsp;//java imports
+package org.apache.tools.todo.taskdefs.jsp;//java imports
 
 import java.io.File;
 import java.util.ArrayList;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapter.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.optional.jsp.compilers;
+package org.apache.tools.todo.taskdefs.jsp.compilers;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
+import org.apache.tools.todo.taskdefs.jsp.JspC;
 
 /**
  * The interface that all jsp compiler adapters must adher to. <p>

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jsp/compilers/CompilerAdapterFactory.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.optional.jsp.compilers;
+package org.apache.tools.todo.taskdefs.jsp.compilers;
 
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;

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

@@ -5,13 +5,13 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
+package org.apache.tools.todo.taskdefs.jsp.compilers;
 
 import java.util.ArrayList;
 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.todo.taskdefs.jsp.JspC;
 import org.apache.tools.todo.types.Commandline;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/jsp/compilers/JasperC.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.optional.jsp.compilers;
+package org.apache.tools.todo.taskdefs.jsp.compilers;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.todo.taskdefs.Java;
-import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
+import org.apache.tools.todo.taskdefs.jsp.JspC;
 import org.apache.tools.todo.types.Argument;
 import org.apache.tools.todo.types.Commandline;
 

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/BaseTest.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.File;
 import java.util.ArrayList;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/BatchTest.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.File;
 import java.util.ArrayList;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/BriefJUnitResultFormatter.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/CompoundIterator.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/CompoundIterator.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/DOMUtil.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/JUnitResultFormatter.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.OutputStream;
 import junit.framework.TestListener;

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/JUnitTest.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.util.ArrayList;
 import java.util.Iterator;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/JUnitTestRunner.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/JUnitVersionHelper.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.lang.reflect.Method;
 import junit.framework.Test;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/NodeListImpl.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/NodeListImpl.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.util.ArrayList;
 import org.w3c.dom.Node;

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

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

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/XMLConstants.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 /**
  * <p>

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

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/Xalan1Executor.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.OutputStream;
 import org.apache.xalan.xslt.XSLTInputSource;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/junit/Xalan2Executor.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.optional.junit;
+package org.apache.tools.todo.taskdefs.junit;
 
 import java.io.OutputStream;
 import javax.xml.transform.Result;

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

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/metamata/MAudit.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.optional.metamata;
+package org.apache.tools.todo.taskdefs.metamata;
 
 import java.io.File;
 import java.util.ArrayList;

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

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

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/Violation.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/metamata/Violation.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.optional.metamata;
+package org.apache.tools.todo.taskdefs.metamata;
 
 /**
  * the class used to report violation information

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/Action.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/Action.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import java.util.Locale;
 import org.apache.tools.todo.types.EnumeratedAttribute;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/AntTelnetClient.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/AntTelnetClient.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import com.oroinc.net.telnet.TelnetClient;
 import java.io.InputStream;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/FTP.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import com.oroinc.net.ftp.FTPClient;
 import com.oroinc.net.ftp.FTPFile;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTPDirectoryScanner.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/FTPDirectoryScanner.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import com.oroinc.net.ftp.FTPClient;
 import com.oroinc.net.ftp.FTPFile;

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

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetRead.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/TelnetRead.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetSubTask.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/TelnetSubTask.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import org.apache.myrmidon.api.TaskException;
 

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetWrite.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/net/TelnetWrite.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.optional.net;
+package org.apache.tools.todo.taskdefs.net;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Add.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import java.io.File;
 import java.util.ArrayList;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Base.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecOutputHandler;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Change.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Counter.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Delete.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Edit.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Have.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Label.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Reopen.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Revert.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Submit.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/perforce/P4Sync.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.optional.perforce;
+package org.apache.tools.todo.taskdefs.perforce;
 
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/pvcs/Pvcs.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.optional.pvcs;
+package org.apache.tools.todo.taskdefs.pvcs;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/pvcs/PvcsProject.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.optional.pvcs;
+package org.apache.tools.todo.taskdefs.pvcs;
 
 /**
  * class to handle <pvcsprojec> elements

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/scm/AntStarTeamCheckOut.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.optional.scm;
+package org.apache.tools.todo.taskdefs.scm;
 
 import com.starbase.starteam.Folder;
 import com.starbase.starteam.Item;

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

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

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

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Exclude.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Exclude.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 /**
  * concrete exclude class

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/FilterElement.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/FilterElement.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 /**
  * default abstract filter element class

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Filters.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Filters.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import java.util.ArrayList;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Finalsnapshot.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Finalsnapshot.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import org.apache.tools.todo.types.EnumeratedAttribute;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Include.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Include.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 /**
  * concrete include class

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Javavm.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Javavm.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import org.apache.tools.todo.types.EnumeratedAttribute;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Recordfromstart.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Recordfromstart.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import org.apache.tools.todo.types.EnumeratedAttribute;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/ReportFilters.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/ReportFilters.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import java.util.ArrayList;
 import org.apache.tools.todo.util.regexp.RegexpMatcher;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Socket.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 /**
  * Socket element for connection. <tt>&lt;socket/&gt;</tt> defaults to host

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/Triggers.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/XMLReport.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.optional.sitraka;
+package org.apache.tools.todo.taskdefs.sitraka;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,10 +17,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.Utils;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.ClassFile;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.ClassPathLoader;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.MethodInfo;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.Utils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassFile.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/bytecode/ClassFile.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.optional.sitraka.bytecode;
+package org.apache.tools.todo.taskdefs.sitraka.bytecode;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -13,7 +13,7 @@ import java.io.InputStream;
 import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ClassCPInfo;
 import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
 import org.apache.tools.ant.taskdefs.optional.depend.constantpool.Utf8CPInfo;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.attributes.AttributeInfo;
 
 /**
  * Object representing a class. Information are kept to the strict minimum for

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/bytecode/ClassPathLoader.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.optional.sitraka.bytecode;
+package org.apache.tools.todo.taskdefs.sitraka.bytecode;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/MethodInfo.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/bytecode/MethodInfo.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.optional.sitraka.bytecode;
+package org.apache.tools.todo.taskdefs.sitraka.bytecode;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;
-import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.attributes.AttributeInfo;
+import org.apache.tools.todo.taskdefs.sitraka.bytecode.attributes.AttributeInfo;
 
 /**
  * Method info structure.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/Utils.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/bytecode/Utils.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.optional.sitraka.bytecode;
+package org.apache.tools.todo.taskdefs.sitraka.bytecode;
 
 import java.util.ArrayList;
 import org.apache.tools.ant.taskdefs.optional.depend.constantpool.ConstantPool;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/sitraka/bytecode/attributes/AttributeInfo.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.optional.sitraka.bytecode.attributes;
+package org.apache.tools.todo.taskdefs.sitraka.bytecode.attributes;
 
 /**
  * Attribute info structure that provides base methods

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/vss/MSVSS.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.optional.vss;
+package org.apache.tools.todo.taskdefs.vss;
 
 import java.io.File;
 import java.util.Properties;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/vss/MSVSSCHECKIN.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.optional.vss;
+package org.apache.tools.todo.taskdefs.vss;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/vss/MSVSSCHECKOUT.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.optional.vss;
+package org.apache.tools.todo.taskdefs.vss;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java → proposal/myrmidon/src/main/org/apache/tools/todo/taskdefs/vss/MSVSSGET.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.optional.vss;
+package org.apache.tools.todo.taskdefs.vss;
 
 import java.io.File;
 import org.apache.myrmidon.api.TaskException;