Make tasks extend AbstractTask directly not via Task

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

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

@@ -10,9 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PathUtil;
@@ -26,7 +25,7 @@ import org.apache.tools.ant.types.PathUtil;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class Available
-    extends Task
+    extends AbstractTask
     implements Condition
 {
     private String m_value = "true";

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

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Log
@@ -19,7 +19,7 @@ import org.apache.tools.ant.Task;
  * @author costin@dnt.ro
  */
 public class Echo
-    extends Task
+    extends AbstractTask
 {
     private String m_message = "";// required
     private File m_file;

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

@@ -15,8 +15,8 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Date;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Get a particular file from a URL source. Options include verbose reporting,
@@ -27,7 +27,7 @@ import org.apache.tools.ant.Task;
  * @author costin@dnt.ro
  * @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth)
  */
-public class Get extends Task
+public class Get extends AbstractTask
 {// required
     private boolean verbose = false;
     private boolean useTimestamp = false;//off by default

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

@@ -12,15 +12,15 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Ant task to read input line from console.
  *
  * @author Ulrich Schmidt <usch@usch.net>
  */
-public class Input extends Task
+public class Input extends AbstractTask
 {
     private String validargs = null;
     private String message = "";

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

@@ -8,10 +8,10 @@
 package org.apache.tools.ant.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.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
 public abstract class MatchingTask
-    extends Task
+    extends AbstractTask
 {
     private FileSet m_fileset = new FileSet();
 

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

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 
 /**
@@ -23,7 +23,7 @@ import org.apache.tools.ant.types.Path;
  * @author Larry Streepy <a href="mailto:streepy@healthlanguage.com">
  *      streepy@healthlanguage.com</a>
  */
-public class PathConvert extends Task
+public class PathConvert extends AbstractTask
 {
     private Path m_path;// Path to be converted
     private String m_targetOS;// The target OS type

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

@@ -14,8 +14,8 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Iterator;
 import java.util.Properties;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PathUtil;
 
@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.PathUtil;
  * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
  */
 public class Property
-    extends Task
+    extends AbstractTask
 {
     private Path m_classpath;
 

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

@@ -481,7 +481,7 @@ public class Rmic extends MatchingTask
         }
 
         String compiler = getContext().getProperty( "build.rmic" ).toString();
-        RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler, this );
+        RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler );
 
         // now we need to populate the compiler adapter
         adapter.setRmic( this );

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

@@ -32,9 +32,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
@@ -51,7 +50,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <A href="mailto:tim.stephenson@sybase.com">Tim Stephenson</A>
  */
 public class SQLExec
-    extends Task
+    extends AbstractTask
 {
     private int goodSql = 0, totalSql = 0;
 

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

@@ -17,8 +17,8 @@ import java.util.Locale;
 import java.util.NoSuchElementException;
 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.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
@@ -31,7 +31,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class Tstamp
-    extends Task
+    extends AbstractTask
 {
     private ArrayList customFormats = new ArrayList();
     private String m_prefix = "";

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java

@@ -18,11 +18,10 @@ import java.util.StringTokenizer;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.aut.nativelib.Os;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.myrmidon.framework.Pattern;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
@@ -64,7 +63,7 @@ import org.apache.tools.ant.util.FileUtils;
  */
 
 public class Javadoc
-    extends Task
+    extends AbstractTask
     implements ExecOutputHandler
 {
     private Commandline m_command = new Commandline();

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

@@ -13,10 +13,10 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
 import org.apache.aut.nativelib.ExecManager;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.ExecuteJava;
 import org.apache.myrmidon.framework.Execute;
+import org.apache.tools.ant.taskdefs.ExecuteJava;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="mailto:emeade@geekfarm.org">Erik Meade</a>
  * @author <a href="mailto:sbailliez@apache.org>Stephane Bailliez</a>
  */
-public class ANTLR extends Task
+public class ANTLR extends AbstractTask
 {
 
     private CommandlineJava commandline = new CommandlineJava();

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

@@ -704,7 +704,8 @@ public class IContract extends MatchingTask
 
             // We want to be notified if iContract jar is missing. This makes life easier for the user
             // who didn't understand that iContract is a separate library (duh!)
-            getProject().addProjectListener( new IContractPresenceDetector() );
+
+            //addProjectListener( new IContractPresenceDetector() );
 
             // Prepare the directories for iContract. iContract will make them if they
             // don't exist, but for some reason I don't know, it will complain about the REP files
@@ -748,7 +749,7 @@ public class IContract extends MatchingTask
             iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) );
 
             // Create a forked java process
-            Java iContract = (Java)getProject().createTask( "java" );
+            Java iContract = null;//(Java)getProject().createTask( "java" );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );

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

@@ -14,15 +14,15 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Iterator;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Execute a script
  *
  * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
  */
-public class Script extends Task
+public class Script extends AbstractTask
 {
     private String script = "";
     private Hashtable beans = new Hashtable();
@@ -88,7 +88,7 @@ public class Script extends Task
     {
         try
         {
-            addBeans( getProject().getProperties() );
+            addBeans( getContext().getPropertys() );
             //In Ant2 there is no difference between properties and references
             //addBeans( getProject().getReferences() );
 

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

@@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import java.io.File;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.Commandline;
  *
  * @author Curtis White
  */
-public abstract class ClearCase extends Task
+public abstract class ClearCase extends AbstractTask
 {
 
     /**

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

@@ -11,9 +11,9 @@ import java.io.File;
 import java.util.Enumeration;
 import java.util.Hashtable;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -26,7 +26,8 @@ import org.apache.tools.ant.types.PathUtil;
  * @author Michael Saunders <a href="mailto:michael@amtec.com">michael@amtec.com
  *      </a>
  */
-public class JJTree extends Task
+public class JJTree
+    extends AbstractTask
 {
     // keys to optional attributes
     private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES";

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

@@ -11,9 +11,9 @@ import java.io.File;
 import java.util.Enumeration;
 import java.util.Hashtable;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -26,7 +26,8 @@ import org.apache.tools.ant.types.PathUtil;
  * @author Michael Saunders <a href="mailto:michael@amtec.com">michael@amtec.com
  *      </a>
  */
-public class JavaCC extends Task
+public class JavaCC
+    extends AbstractTask
 {
 
     // keys to optional attributes

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

@@ -12,9 +12,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -33,7 +33,7 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:roxspring@yahoo.com">Rob Oxspring</a>
  */
 public class JDependTask
-    extends Task
+    extends AbstractTask
 {
     /**
      * No problems with this test.

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

@@ -7,8 +7,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Creates the necessary compiler adapter, given basic criteria.
@@ -44,7 +44,7 @@ public class CompilerAdapterFactory
      * @throws TaskException if the compiler type could not be resolved into a
      *      compiler adapter.
      */
-    public static CompilerAdapter getCompiler( String compilerType, Task task )
+    public static CompilerAdapter getCompiler( String compilerType, AbstractTask task )
         throws TaskException
     {
         /*

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

@@ -17,11 +17,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 /**
  * Transform a JUnit xml report. The default transformation generates an html
@@ -60,7 +59,7 @@ public class AggregateTransformer
      */
     private File m_styleDir;
 
-    private Task m_task;
+    private AbstractTask m_task;
 
     /**
      * the destination directory, this is the root from where html should be
@@ -68,7 +67,7 @@ public class AggregateTransformer
      */
     private File m_toDir;
 
-    public AggregateTransformer( Task task )
+    public AggregateTransformer( AbstractTask task )
     {
         m_task = task;
     }
@@ -109,10 +108,8 @@ public class AggregateTransformer
         throws TaskException
     {
         checkOptions();
-        final long t0 = System.currentTimeMillis();
         try
         {
-            Element root = m_document.getDocumentElement();
             XalanExecutor executor = XalanExecutor.newInstance( this );
             executor.execute();
         }
@@ -120,7 +117,6 @@ public class AggregateTransformer
         {
             throw new TaskException( "Errors while applying transformations", e );
         }
-        final long dt = System.currentTimeMillis() - t0;
         //task.getLogger().info( "Transform time: " + dt + "ms" );
     }
 

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

@@ -18,9 +18,8 @@ import java.util.Iterator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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;
@@ -44,7 +43,7 @@ import org.xml.sax.SAXException;
  * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class XMLResultAggregator
-    extends Task
+    extends AbstractTask
     implements XMLConstants
 {
     /**

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

@@ -15,10 +15,9 @@ import java.util.ArrayList;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
@@ -33,7 +32,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class MParse
-    extends Task
+    extends AbstractTask
 {
     private Path m_classpath;
     private Path m_sourcepath;

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

@@ -22,10 +22,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import org.apache.avalon.excalibur.io.FileUtil;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -53,7 +52,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class FTP
-    extends Task
+    extends AbstractTask
 {
     protected final static int SEND_FILES = 0;
     protected final static int GET_FILES = 1;

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

@@ -23,8 +23,8 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -41,7 +41,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author paulo.gaspar@krankikom.de Paulo Gaspar
  * @created 01 May 2001
  */
-public class MimeMail extends Task
+public class MimeMail extends AbstractTask
 {
     /**
      * failure flag

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

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce;
 
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecOutputHandler;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.oro.text.perl.Perl5Util;
 import org.apache.tools.ant.types.Commandline;
@@ -26,10 +26,9 @@ import org.apache.tools.ant.types.Commandline;
  * @see P4Edit
  * @see P4Submit
  * @see P4Label
- * @see org.apache.tools.ant.taskdefs.Exec
  */
 public abstract class P4Base
-    extends org.apache.tools.ant.Task
+    extends AbstractTask
     implements ExecOutputHandler
 {
     /**
@@ -123,7 +122,6 @@ public abstract class P4Base
     {
         //Setup task before executing it
         prepare();
-        super.execute();
     }
 
     /**

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

@@ -16,6 +16,7 @@ import com.starbase.starteam.Type;
 import com.starbase.starteam.View;
 import com.starbase.util.Platform;
 import java.util.StringTokenizer;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.ScannerUtil;
 
@@ -60,9 +61,9 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @version 1.0
  * @see <A HREF="http://www.starbase.com/">StarBase Web Site</A>
  */
-public class AntStarTeamCheckOut extends org.apache.tools.ant.Task
+public class AntStarTeamCheckOut
+    extends AbstractTask
 {
-
     /**
      * This constant sets the filter to include all files. This default has the
      * same result as <CODE>setIncludes("*")</CODE>.

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

@@ -14,9 +14,8 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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.DirectoryScanner;
@@ -28,9 +27,9 @@ import org.apache.tools.ant.types.ScannerUtil;
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
-public class CovMerge extends Task
+public class CovMerge
+    extends AbstractTask
 {
-
     /**
      * coverage home, it is mandatory
      */

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

@@ -18,9 +18,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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.EnumeratedAttribute;
@@ -32,7 +31,8 @@ import org.w3c.dom.Document;
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
-public class CovReport extends Task
+public class CovReport
+    extends AbstractTask
 {
     /*
      * jpcoverport [options] -output=file -snapshot=snapshot.jpc

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

@@ -14,9 +14,8 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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;
@@ -36,7 +35,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class Coverage
-    extends Task
+    extends AbstractTask
 {
     protected Commandline cmdl = new Commandline();
     protected CommandlineJava cmdlJava = new CommandlineJava();

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

@@ -15,7 +15,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.AbstractTask;
 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;
@@ -74,7 +74,7 @@ public class XMLReport
     /**
      * task caller, can be null, used for logging purpose
      */
-    protected Task task;
+    protected AbstractTask task;
 
     /**
      * create a new XML report, logging will be on stdout
@@ -92,7 +92,7 @@ public class XMLReport
      * @param task Description of Parameter
      * @param file Description of Parameter
      */
-    public XMLReport( Task task, File file )
+    public XMLReport( AbstractTask task, File file )
     {
         this.file = file;
         this.task = task;

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

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.vss;
 import java.io.File;
 import java.util.Properties;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Commandline;
  * @author Craig Cottingham
  * @author Andrew Everitt
  */
-public abstract class MSVSS extends Task
+public abstract class MSVSS
+    extends AbstractTask
 {
 
     /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java

@@ -8,7 +8,6 @@
 package org.apache.tools.ant.taskdefs.rmic;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Creates the necessary rmic adapter, given basic criteria.
@@ -39,12 +38,11 @@ public class RmicAdapterFactory
      *
      * @param rmicType either the name of the desired rmic, or the full
      *      classname of the rmic's adapter.
-     * @param task a task to log through.
      * @return The Rmic value
      * @throws TaskException if the rmic type could not be resolved into a rmic
      *      adapter.
      */
-    public static RmicAdapter getRmic( String rmicType, Task task )
+    public static RmicAdapter getRmic( String rmicType )
         throws TaskException
     {
         if( rmicType == null )

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -68,7 +68,8 @@ import org.apache.tools.ant.util.regexp.Regexp;
  *
  * @author <a href="mailto:mattinger@mindless.com">Matthew Inger</a>
  */
-public class ReplaceRegExp extends Task
+public class ReplaceRegExp
+    extends AbstractTask
 {
     private boolean byline;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java

@@ -10,9 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.taskdefs.condition.Condition;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PathUtil;
@@ -26,7 +25,7 @@ import org.apache.tools.ant.types.PathUtil;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class Available
-    extends Task
+    extends AbstractTask
     implements Condition
 {
     private String m_value = "true";

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Log
@@ -19,7 +19,7 @@ import org.apache.tools.ant.Task;
  * @author costin@dnt.ro
  */
 public class Echo
-    extends Task
+    extends AbstractTask
 {
     private String m_message = "";// required
     private File m_file;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java

@@ -15,8 +15,8 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Date;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Get a particular file from a URL source. Options include verbose reporting,
@@ -27,7 +27,7 @@ import org.apache.tools.ant.Task;
  * @author costin@dnt.ro
  * @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth)
  */
-public class Get extends Task
+public class Get extends AbstractTask
 {// required
     private boolean verbose = false;
     private boolean useTimestamp = false;//off by default

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java

@@ -12,15 +12,15 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Ant task to read input line from console.
  *
  * @author Ulrich Schmidt <usch@usch.net>
  */
-public class Input extends Task
+public class Input extends AbstractTask
 {
     private String validargs = null;
     private String message = "";

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

@@ -8,10 +8,10 @@
 package org.apache.tools.ant.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.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
 public abstract class MatchingTask
-    extends Task
+    extends AbstractTask
 {
     private FileSet m_fileset = new FileSet();
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.util.ArrayList;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 
 /**
@@ -23,7 +23,7 @@ import org.apache.tools.ant.types.Path;
  * @author Larry Streepy <a href="mailto:streepy@healthlanguage.com">
  *      streepy@healthlanguage.com</a>
  */
-public class PathConvert extends Task
+public class PathConvert extends AbstractTask
 {
     private Path m_path;// Path to be converted
     private String m_targetOS;// The target OS type

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java

@@ -14,8 +14,8 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Iterator;
 import java.util.Properties;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.PathUtil;
 
@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.PathUtil;
  * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
  */
 public class Property
-    extends Task
+    extends AbstractTask
 {
     private Path m_classpath;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java

@@ -481,7 +481,7 @@ public class Rmic extends MatchingTask
         }
 
         String compiler = getContext().getProperty( "build.rmic" ).toString();
-        RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler, this );
+        RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler );
 
         // now we need to populate the compiler adapter
         adapter.setRmic( this );

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -32,9 +32,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.FileSet;
@@ -51,7 +50,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <A href="mailto:tim.stephenson@sybase.com">Tim Stephenson</A>
  */
 public class SQLExec
-    extends Task
+    extends AbstractTask
 {
     private int goodSql = 0, totalSql = 0;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java

@@ -17,8 +17,8 @@ import java.util.Locale;
 import java.util.NoSuchElementException;
 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.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 
 /**
@@ -31,7 +31,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class Tstamp
-    extends Task
+    extends AbstractTask
 {
     private ArrayList customFormats = new ArrayList();
     private String m_prefix = "";

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java

@@ -18,11 +18,10 @@ import java.util.StringTokenizer;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecOutputHandler;
 import org.apache.aut.nativelib.Os;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.myrmidon.framework.Pattern;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
@@ -64,7 +63,7 @@ import org.apache.tools.ant.util.FileUtils;
  */
 
 public class Javadoc
-    extends Task
+    extends AbstractTask
     implements ExecOutputHandler
 {
     private Commandline m_command = new Commandline();

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

@@ -13,10 +13,10 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;
 import org.apache.aut.nativelib.ExecManager;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.ExecuteJava;
 import org.apache.myrmidon.framework.Execute;
+import org.apache.tools.ant.taskdefs.ExecuteJava;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="mailto:emeade@geekfarm.org">Erik Meade</a>
  * @author <a href="mailto:sbailliez@apache.org>Stephane Bailliez</a>
  */
-public class ANTLR extends Task
+public class ANTLR extends AbstractTask
 {
 
     private CommandlineJava commandline = new CommandlineJava();

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

@@ -704,7 +704,8 @@ public class IContract extends MatchingTask
 
             // We want to be notified if iContract jar is missing. This makes life easier for the user
             // who didn't understand that iContract is a separate library (duh!)
-            getProject().addProjectListener( new IContractPresenceDetector() );
+
+            //addProjectListener( new IContractPresenceDetector() );
 
             // Prepare the directories for iContract. iContract will make them if they
             // don't exist, but for some reason I don't know, it will complain about the REP files
@@ -748,7 +749,7 @@ public class IContract extends MatchingTask
             iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) );
 
             // Create a forked java process
-            Java iContract = (Java)getProject().createTask( "java" );
+            Java iContract = null;//(Java)getProject().createTask( "java" );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java

@@ -14,15 +14,15 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Hashtable;
 import java.util.Iterator;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Execute a script
  *
  * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
  */
-public class Script extends Task
+public class Script extends AbstractTask
 {
     private String script = "";
     private Hashtable beans = new Hashtable();
@@ -88,7 +88,7 @@ public class Script extends Task
     {
         try
         {
-            addBeans( getProject().getProperties() );
+            addBeans( getContext().getPropertys() );
             //In Ant2 there is no difference between properties and references
             //addBeans( getProject().getReferences() );
 

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

@@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase;
 
 import java.io.File;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.Commandline;
  *
  * @author Curtis White
  */
-public abstract class ClearCase extends Task
+public abstract class ClearCase extends AbstractTask
 {
 
     /**

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

@@ -11,9 +11,9 @@ import java.io.File;
 import java.util.Enumeration;
 import java.util.Hashtable;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -26,7 +26,8 @@ import org.apache.tools.ant.types.PathUtil;
  * @author Michael Saunders <a href="mailto:michael@amtec.com">michael@amtec.com
  *      </a>
  */
-public class JJTree extends Task
+public class JJTree
+    extends AbstractTask
 {
     // keys to optional attributes
     private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES";

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

@@ -11,9 +11,9 @@ import java.io.File;
 import java.util.Enumeration;
 import java.util.Hashtable;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -26,7 +26,8 @@ import org.apache.tools.ant.types.PathUtil;
  * @author Michael Saunders <a href="mailto:michael@amtec.com">michael@amtec.com
  *      </a>
  */
-public class JavaCC extends Task
+public class JavaCC
+    extends AbstractTask
 {
 
     // keys to optional attributes

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

@@ -12,9 +12,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -33,7 +33,7 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:roxspring@yahoo.com">Rob Oxspring</a>
  */
 public class JDependTask
-    extends Task
+    extends AbstractTask
 {
     /**
      * No problems with this test.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java

@@ -7,8 +7,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Creates the necessary compiler adapter, given basic criteria.
@@ -44,7 +44,7 @@ public class CompilerAdapterFactory
      * @throws TaskException if the compiler type could not be resolved into a
      *      compiler adapter.
      */
-    public static CompilerAdapter getCompiler( String compilerType, Task task )
+    public static CompilerAdapter getCompiler( String compilerType, AbstractTask task )
         throws TaskException
     {
         /*

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

@@ -17,11 +17,10 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 
 /**
  * Transform a JUnit xml report. The default transformation generates an html
@@ -60,7 +59,7 @@ public class AggregateTransformer
      */
     private File m_styleDir;
 
-    private Task m_task;
+    private AbstractTask m_task;
 
     /**
      * the destination directory, this is the root from where html should be
@@ -68,7 +67,7 @@ public class AggregateTransformer
      */
     private File m_toDir;
 
-    public AggregateTransformer( Task task )
+    public AggregateTransformer( AbstractTask task )
     {
         m_task = task;
     }
@@ -109,10 +108,8 @@ public class AggregateTransformer
         throws TaskException
     {
         checkOptions();
-        final long t0 = System.currentTimeMillis();
         try
         {
-            Element root = m_document.getDocumentElement();
             XalanExecutor executor = XalanExecutor.newInstance( this );
             executor.execute();
         }
@@ -120,7 +117,6 @@ public class AggregateTransformer
         {
             throw new TaskException( "Errors while applying transformations", e );
         }
-        final long dt = System.currentTimeMillis() - t0;
         //task.getLogger().info( "Transform time: " + dt + "ms" );
     }
 

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

@@ -18,9 +18,8 @@ import java.util.Iterator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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;
@@ -44,7 +43,7 @@ import org.xml.sax.SAXException;
  * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class XMLResultAggregator
-    extends Task
+    extends AbstractTask
     implements XMLConstants
 {
     /**

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

@@ -15,10 +15,9 @@ import java.util.ArrayList;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.avalon.excalibur.io.IOUtil;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
@@ -33,7 +32,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class MParse
-    extends Task
+    extends AbstractTask
 {
     private Path m_classpath;
     private Path m_sourcepath;

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

@@ -22,10 +22,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import org.apache.avalon.excalibur.io.FileUtil;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -53,7 +52,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 public class FTP
-    extends Task
+    extends AbstractTask
 {
     protected final static int SEND_FILES = 0;
     protected final static int GET_FILES = 1;

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

@@ -23,8 +23,8 @@ import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -41,7 +41,7 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @author paulo.gaspar@krankikom.de Paulo Gaspar
  * @created 01 May 2001
  */
-public class MimeMail extends Task
+public class MimeMail extends AbstractTask
 {
     /**
      * failure flag

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

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce;
 
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.aut.nativelib.ExecOutputHandler;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.oro.text.perl.Perl5Util;
 import org.apache.tools.ant.types.Commandline;
@@ -26,10 +26,9 @@ import org.apache.tools.ant.types.Commandline;
  * @see P4Edit
  * @see P4Submit
  * @see P4Label
- * @see org.apache.tools.ant.taskdefs.Exec
  */
 public abstract class P4Base
-    extends org.apache.tools.ant.Task
+    extends AbstractTask
     implements ExecOutputHandler
 {
     /**
@@ -123,7 +122,6 @@ public abstract class P4Base
     {
         //Setup task before executing it
         prepare();
-        super.execute();
     }
 
     /**

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

@@ -16,6 +16,7 @@ import com.starbase.starteam.Type;
 import com.starbase.starteam.View;
 import com.starbase.util.Platform;
 import java.util.StringTokenizer;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.types.ScannerUtil;
 
@@ -60,9 +61,9 @@ import org.apache.tools.ant.types.ScannerUtil;
  * @version 1.0
  * @see <A HREF="http://www.starbase.com/">StarBase Web Site</A>
  */
-public class AntStarTeamCheckOut extends org.apache.tools.ant.Task
+public class AntStarTeamCheckOut
+    extends AbstractTask
 {
-
     /**
      * This constant sets the filter to include all files. This default has the
      * same result as <CODE>setIncludes("*")</CODE>.

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

@@ -14,9 +14,8 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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.DirectoryScanner;
@@ -28,9 +27,9 @@ import org.apache.tools.ant.types.ScannerUtil;
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
-public class CovMerge extends Task
+public class CovMerge
+    extends AbstractTask
 {
-
     /**
      * coverage home, it is mandatory
      */

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

@@ -18,9 +18,8 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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.EnumeratedAttribute;
@@ -32,7 +31,8 @@ import org.w3c.dom.Document;
  *
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
-public class CovReport extends Task
+public class CovReport
+    extends AbstractTask
 {
     /*
      * jpcoverport [options] -output=file -snapshot=snapshot.jpc

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

@@ -14,9 +14,8 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.AbstractTask;
-import org.apache.tools.ant.Task;
+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;
@@ -36,7 +35,7 @@ import org.apache.tools.ant.types.Path;
  * @author <a href="sbailliez@imediation.com">Stephane Bailliez</a>
  */
 public class Coverage
-    extends Task
+    extends AbstractTask
 {
     protected Commandline cmdl = new Commandline();
     protected CommandlineJava cmdlJava = new CommandlineJava();

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java

@@ -15,7 +15,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.AbstractTask;
 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;
@@ -74,7 +74,7 @@ public class XMLReport
     /**
      * task caller, can be null, used for logging purpose
      */
-    protected Task task;
+    protected AbstractTask task;
 
     /**
      * create a new XML report, logging will be on stdout
@@ -92,7 +92,7 @@ public class XMLReport
      * @param task Description of Parameter
      * @param file Description of Parameter
      */
-    public XMLReport( Task task, File file )
+    public XMLReport( AbstractTask task, File file )
     {
         this.file = file;
         this.task = task;

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

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.vss;
 import java.io.File;
 import java.util.Properties;
 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.Task;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Commandline;
  * @author Craig Cottingham
  * @author Andrew Everitt
  */
-public abstract class MSVSS extends Task
+public abstract class MSVSS
+    extends AbstractTask
 {
 
     /**

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java

@@ -8,7 +8,6 @@
 package org.apache.tools.ant.taskdefs.rmic;
 
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 
 /**
  * Creates the necessary rmic adapter, given basic criteria.
@@ -39,12 +38,11 @@ public class RmicAdapterFactory
      *
      * @param rmicType either the name of the desired rmic, or the full
      *      classname of the rmic's adapter.
-     * @param task a task to log through.
      * @return The Rmic value
      * @throws TaskException if the rmic type could not be resolved into a rmic
      *      adapter.
      */
-    public static RmicAdapter getRmic( String rmicType, Task task )
+    public static RmicAdapter getRmic( String rmicType )
         throws TaskException
     {
         if( rmicType == null )

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java

@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import org.apache.myrmidon.api.AbstractTask;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.ScannerUtil;
@@ -68,7 +68,8 @@ import org.apache.tools.ant.util.regexp.Regexp;
  *
  * @author <a href="mailto:mattinger@mindless.com">Matthew Inger</a>
  */
-public class ReplaceRegExp extends Task
+public class ReplaceRegExp
+    extends AbstractTask
 {
     private boolean byline;