diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
index 2e5a73be3..e537e3732 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/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 Magesh Umasankar
*/
public class Available
- extends Task
+ extends AbstractTask
implements Condition
{
private String m_value = "true";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
index 4c61b3c60..69a1c4368 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
+++ b/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;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
index d0d087cf9..f792ee4e0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
index 1b8cf707c..c43490ed0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/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
*/
-public class Input extends Task
+public class Input extends AbstractTask
{
private String validargs = null;
private String message = "";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index bdca4ce22..8fed26344 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/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 Stefan Bodewig
*/
public abstract class MatchingTask
- extends Task
+ extends AbstractTask
{
private FileSet m_fileset = new FileSet();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
index 9348b6c3b..c8e1ca784 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/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
* streepy@healthlanguage.com
*/
-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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
index 7928ba740..d8ef8136d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/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 Glenn McAllister
*/
public class Property
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index c12bbac19..5a0115221 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/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 );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index a17c87e50..30628c702 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/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 Tim Stephenson
*/
public class SQLExec
- extends Task
+ extends AbstractTask
{
private int goodSql = 0, totalSql = 0;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index 18be15831..a52db7861 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/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 Magesh Umasankar
*/
public class Tstamp
- extends Task
+ extends AbstractTask
{
private ArrayList customFormats = new ArrayList();
private String m_prefix = "";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
index 0b1ec1887..bf38015e3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
+++ b/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();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 4d65cc2cb..b4932b856 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -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 Erik Meade
* @author rubys@us.ibm.com
*/
-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() );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 43d3ef50e..adde36042 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -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
{
/**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index aa43f3cbb..ede583b38 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -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 michael@amtec.com
*
*/
-public class JJTree extends Task
+public class JJTree
+ extends AbstractTask
{
// keys to optional attributes
private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 144c6992c..e6f628548 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -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 michael@amtec.com
*
*/
-public class JavaCC extends Task
+public class JavaCC
+ extends AbstractTask
{
// keys to optional attributes
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 503effaa3..601b79129 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -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 Rob Oxspring
*/
public class JDependTask
- extends Task
+ extends AbstractTask
{
/**
* No problems with this test.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
index 41ed4f9c9..5b9c017b8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
+++ b/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
{
/*
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index 7e488803f..9f6ff4ded 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -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" );
}
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index a19900fde..1b3313ff7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -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 Stephane Bailliez
*/
public class XMLResultAggregator
- extends Task
+ extends AbstractTask
implements XMLConstants
{
/**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
index 8ee27b9dd..f657dc4f0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
@@ -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 Stephane Bailliez
*/
public class MParse
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
private Path m_sourcepath;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 2e75d5919..cafbeef40 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/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 Magesh Umasankar
*/
public class FTP
- extends Task
+ extends AbstractTask
{
protected final static int SEND_FILES = 0;
protected final static int GET_FILES = 1;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
index 2c37a617d..0c901da34 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
+++ b/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
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index 38f83a018..af428cde4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -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();
}
/**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
index c2f983c60..6a54fc186 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
@@ -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 StarBase Web Site
*/
-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 setIncludes("*").
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
index bfad3a28f..94b81e4b6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
@@ -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 Stephane Bailliez
*/
-public class CovMerge extends Task
+public class CovMerge
+ extends AbstractTask
{
-
/**
* coverage home, it is mandatory
*/
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index 62b3f6750..32e5000c3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
@@ -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 Stephane Bailliez
*/
-public class CovReport extends Task
+public class CovReport
+ extends AbstractTask
{
/*
* jpcoverport [options] -output=file -snapshot=snapshot.jpc
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 14dbb7458..de68a26d8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
@@ -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 Stephane Bailliez
*/
public class Coverage
- extends Task
+ extends AbstractTask
{
protected Commandline cmdl = new Commandline();
protected CommandlineJava cmdlJava = new CommandlineJava();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
index 6bf76faf2..3af54a71a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
+++ b/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;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 703443e8e..81b4d41e4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -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
{
/**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
index eb05611ac..a0949ebe8 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
+++ b/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 )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index dec75cdd4..e4627185f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
+++ b/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 Matthew Inger
*/
-public class ReplaceRegExp extends Task
+public class ReplaceRegExp
+ extends AbstractTask
{
private boolean byline;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
index 2e5a73be3..e537e3732 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
+++ b/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 Magesh Umasankar
*/
public class Available
- extends Task
+ extends AbstractTask
implements Condition
{
private String m_value = "true";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
index 4c61b3c60..69a1c4368 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
+++ b/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;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
index d0d087cf9..f792ee4e0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
+++ b/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
index 1b8cf707c..c43490ed0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
+++ b/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
*/
-public class Input extends Task
+public class Input extends AbstractTask
{
private String validargs = null;
private String message = "";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
index bdca4ce22..8fed26344 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/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 Stefan Bodewig
*/
public abstract class MatchingTask
- extends Task
+ extends AbstractTask
{
private FileSet m_fileset = new FileSet();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java
index 9348b6c3b..c8e1ca784 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java
+++ b/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
* streepy@healthlanguage.com
*/
-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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
index 7928ba740..d8ef8136d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
+++ b/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 Glenn McAllister
*/
public class Property
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
index c12bbac19..5a0115221 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/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 );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
index a17c87e50..30628c702 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/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 Tim Stephenson
*/
public class SQLExec
- extends Task
+ extends AbstractTask
{
private int goodSql = 0, totalSql = 0;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
index 18be15831..a52db7861 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/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 Magesh Umasankar
*/
public class Tstamp
- extends Task
+ extends AbstractTask
{
private ArrayList customFormats = new ArrayList();
private String m_prefix = "";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
index 0b1ec1887..bf38015e3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
+++ b/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();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 4d65cc2cb..b4932b856 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -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 Erik Meade
* @author rubys@us.ibm.com
*/
-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() );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 43d3ef50e..adde36042 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -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
{
/**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index aa43f3cbb..ede583b38 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -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 michael@amtec.com
*
*/
-public class JJTree extends Task
+public class JJTree
+ extends AbstractTask
{
// keys to optional attributes
private final static String BUILD_NODE_FILES = "BUILD_NODE_FILES";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 144c6992c..e6f628548 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -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 michael@amtec.com
*
*/
-public class JavaCC extends Task
+public class JavaCC
+ extends AbstractTask
{
// keys to optional attributes
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index 503effaa3..601b79129 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -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 Rob Oxspring
*/
public class JDependTask
- extends Task
+ extends AbstractTask
{
/**
* No problems with this test.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
index 41ed4f9c9..5b9c017b8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
+++ b/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
{
/*
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index 7e488803f..9f6ff4ded 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -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" );
}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index a19900fde..1b3313ff7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -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 Stephane Bailliez
*/
public class XMLResultAggregator
- extends Task
+ extends AbstractTask
implements XMLConstants
{
/**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
index 8ee27b9dd..f657dc4f0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
@@ -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 Stephane Bailliez
*/
public class MParse
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
private Path m_sourcepath;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 2e75d5919..cafbeef40 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/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 Magesh Umasankar
*/
public class FTP
- extends Task
+ extends AbstractTask
{
protected final static int SEND_FILES = 0;
protected final static int GET_FILES = 1;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
index 2c37a617d..0c901da34 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
+++ b/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
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index 38f83a018..af428cde4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -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();
}
/**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
index c2f983c60..6a54fc186 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
@@ -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 StarBase Web Site
*/
-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 setIncludes("*").
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
index bfad3a28f..94b81e4b6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
@@ -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 Stephane Bailliez
*/
-public class CovMerge extends Task
+public class CovMerge
+ extends AbstractTask
{
-
/**
* coverage home, it is mandatory
*/
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index 62b3f6750..32e5000c3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
@@ -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 Stephane Bailliez
*/
-public class CovReport extends Task
+public class CovReport
+ extends AbstractTask
{
/*
* jpcoverport [options] -output=file -snapshot=snapshot.jpc
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 14dbb7458..de68a26d8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
@@ -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 Stephane Bailliez
*/
public class Coverage
- extends Task
+ extends AbstractTask
{
protected Commandline cmdl = new Commandline();
protected CommandlineJava cmdlJava = new CommandlineJava();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
index 6bf76faf2..3af54a71a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
+++ b/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;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 703443e8e..81b4d41e4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -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
{
/**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
index eb05611ac..a0949ebe8 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
+++ b/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 )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
index dec75cdd4..e4627185f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
+++ b/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 Matthew Inger
*/
-public class ReplaceRegExp extends Task
+public class ReplaceRegExp
+ extends AbstractTask
{
private boolean byline;