donaldp 02/02/21 01:41:55
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Available.java Echo.java Get.java Input.java
MatchingTask.java PathConvert.java Property.java
Rmic.java SQLExec.java Tstamp.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
Javadoc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java IContract.java Script.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JavaCC.java JJTree.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
CompilerAdapterFactory.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
AggregateTransformer.java XMLResultAggregator.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
MParse.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java MimeMail.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Base.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm
AntStarTeamCheckOut.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
Coverage.java CovMerge.java CovReport.java
XMLReport.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
RmicAdapterFactory.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text
ReplaceRegExp.java
Log:
Make tasks extend AbstractTask directly not via Task
Revision Changes Path
1.23 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Available.java 18 Feb 2002 09:02:39 -0000 1.22
+++ Available.java 21 Feb 2002 09:41:53 -0000 1.23
@@ -10,9 +10,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
*/
public class Available
- extends Task
+ extends AbstractTask
implements Condition
{
private String m_value = "true";
1.12 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
Index: Echo.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Echo.java 30 Dec 2001 10:46:58 -0000 1.11
+++ Echo.java 21 Feb 2002 09:41:53 -0000 1.12
@@ -10,8 +10,8 @@
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 @@
* @author [EMAIL PROTECTED]
*/
public class Echo
- extends Task
+ extends AbstractTask
{
private String m_message = "";// required
private File m_file;
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Get.java 6 Feb 2002 13:38:20 -0000 1.15
+++ Get.java 21 Feb 2002 09:41:53 -0000 1.16
@@ -15,8 +15,8 @@
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 @@
* @author [EMAIL PROTECTED]
* @author [EMAIL PROTECTED] (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
1.15 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
Index: Input.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Input.java 6 Feb 2002 13:38:20 -0000 1.14
+++ Input.java 21 Feb 2002 09:41:53 -0000 1.15
@@ -12,15 +12,15 @@
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 <[EMAIL PROTECTED]>
*/
-public class Input extends Task
+public class Input extends AbstractTask
{
private String validargs = null;
private String message = "";
1.17 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
Index: MatchingTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MatchingTask.java 27 Jan 2002 09:42:39 -0000 1.16
+++ MatchingTask.java 21 Feb 2002 09:41:53 -0000 1.17
@@ -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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*/
public abstract class MatchingTask
- extends Task
+ extends AbstractTask
{
private FileSet m_fileset = new FileSet();
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PathConvert.java 6 Feb 2002 13:38:20 -0000 1.15
+++ PathConvert.java 21 Feb 2002 09:41:54 -0000 1.16
@@ -9,8 +9,8 @@
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 @@
* @author Larry Streepy <a href="mailto:[EMAIL PROTECTED]">
* [EMAIL PROTECTED]</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
1.30 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Property.java 6 Feb 2002 13:38:20 -0000 1.29
+++ Property.java 21 Feb 2002 09:41:54 -0000 1.30
@@ -14,8 +14,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Glenn McAllister</a>
*/
public class Property
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
1.28 +1 -1
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Rmic.java 18 Feb 2002 09:02:39 -0000 1.27
+++ Rmic.java 21 Feb 2002 09:41:54 -0000 1.28
@@ -481,7 +481,7 @@
}
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 );
1.26 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SQLExec.java 18 Feb 2002 09:02:39 -0000 1.25
+++ SQLExec.java 21 Feb 2002 09:41:54 -0000 1.26
@@ -32,9 +32,8 @@
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 @@
* @author <A href="mailto:[EMAIL PROTECTED]">Tim Stephenson</A>
*/
public class SQLExec
- extends Task
+ extends AbstractTask
{
private int goodSql = 0, totalSql = 0;
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
Index: Tstamp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Tstamp.java 18 Feb 2002 09:02:39 -0000 1.15
+++ Tstamp.java 21 Feb 2002 09:41:54 -0000 1.16
@@ -17,8 +17,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
*/
public class Tstamp
- extends Task
+ extends AbstractTask
{
private ArrayList customFormats = new ArrayList();
private String m_prefix = "";
1.28 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Javadoc.java 18 Feb 2002 09:02:40 -0000 1.27
+++ Javadoc.java 21 Feb 2002 09:41:54 -0000 1.28
@@ -18,11 +18,10 @@
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 @@
*/
public class Javadoc
- extends Task
+ extends AbstractTask
implements ExecOutputHandler
{
private Commandline m_command = new Commandline();
1.25 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ANTLR.java 10 Feb 2002 00:46:51 -0000 1.24
+++ ANTLR.java 21 Feb 2002 09:41:54 -0000 1.25
@@ -13,10 +13,10 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Erik Meade</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Stephane Bailliez</a>
*/
-public class ANTLR extends Task
+public class ANTLR extends AbstractTask
{
private CommandlineJava commandline = new CommandlineJava();
1.21 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- IContract.java 18 Feb 2002 09:02:39 -0000 1.20
+++ IContract.java 21 Feb 2002 09:41:54 -0000 1.21
@@ -704,7 +704,8 @@
// 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 @@
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 );
1.15 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Script.java 6 Feb 2002 13:37:59 -0000 1.14
+++ Script.java 21 Feb 2002 09:41:54 -0000 1.15
@@ -14,15 +14,15 @@
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:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
*/
-public class Script extends Task
+public class Script extends AbstractTask
{
private String script = "";
private Hashtable beans = new Hashtable();
@@ -88,7 +88,7 @@
{
try
{
- addBeans( getProject().getProperties() );
+ addBeans( getContext().getPropertys() );
//In Ant2 there is no difference between properties and
references
//addBeans( getProject().getReferences() );
1.20 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ClearCase.java 10 Feb 2002 01:01:13 -0000 1.19
+++ ClearCase.java 21 Feb 2002 09:41:54 -0000 1.20
@@ -9,9 +9,9 @@
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 @@
*
* @author Curtis White
*/
-public abstract class ClearCase extends Task
+public abstract class ClearCase extends AbstractTask
{
/**
1.23 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JavaCC.java 10 Feb 2002 01:01:12 -0000 1.22
+++ JavaCC.java 21 Feb 2002 09:41:54 -0000 1.23
@@ -11,9 +11,9 @@
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 @@
* @author Michael Saunders <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]
* </a>
*/
-public class JavaCC extends Task
+public class JavaCC
+ extends AbstractTask
{
// keys to optional attributes
1.29 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JJTree.java 18 Feb 2002 09:02:40 -0000 1.28
+++ JJTree.java 21 Feb 2002 09:41:54 -0000 1.29
@@ -11,9 +11,9 @@
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 @@
* @author Michael Saunders <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]
* </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";
1.27 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- JDependTask.java 10 Feb 2002 01:01:12 -0000 1.26
+++ JDependTask.java 21 Feb 2002 09:41:54 -0000 1.27
@@ -12,9 +12,9 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Rob Oxspring</a>
*/
public class JDependTask
- extends Task
+ extends AbstractTask
{
/**
* No problems with this test.
1.4 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
Index: CompilerAdapterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompilerAdapterFactory.java 23 Dec 2001 06:31:58 -0000 1.3
+++ CompilerAdapterFactory.java 21 Feb 2002 09:41:54 -0000 1.4
@@ -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 @@
* @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
{
/*
1.10 +3 -7
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
Index: AggregateTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AggregateTransformer.java 6 Jan 2002 02:28:02 -0000 1.9
+++ AggregateTransformer.java 21 Feb 2002 09:41:55 -0000 1.10
@@ -17,11 +17,10 @@
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 @@
*/
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 @@
*/
private File m_toDir;
- public AggregateTransformer( Task task )
+ public AggregateTransformer( AbstractTask task )
{
m_task = task;
}
@@ -109,10 +108,8 @@
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 @@
{
throw new TaskException( "Errors while applying
transformations", e );
}
- final long dt = System.currentTimeMillis() - t0;
//task.getLogger().info( "Transform time: " + dt + "ms" );
}
1.19 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLResultAggregator.java 18 Feb 2002 09:02:39 -0000 1.18
+++ XMLResultAggregator.java 21 Feb 2002 09:41:55 -0000 1.19
@@ -18,9 +18,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
public class XMLResultAggregator
- extends Task
+ extends AbstractTask
implements XMLConstants
{
/**
1.28 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- MParse.java 18 Feb 2002 09:02:40 -0000 1.27
+++ MParse.java 21 Feb 2002 09:41:55 -0000 1.28
@@ -15,10 +15,9 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
public class MParse
- extends Task
+ extends AbstractTask
{
private Path m_classpath;
private Path m_sourcepath;
1.17 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Index: FTP.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FTP.java 18 Feb 2002 09:02:40 -0000 1.16
+++ FTP.java 21 Feb 2002 09:41:55 -0000 1.17
@@ -22,10 +22,9 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Magesh Umasankar</a>
*/
public class FTP
- extends Task
+ extends AbstractTask
{
protected final static int SEND_FILES = 0;
protected final static int GET_FILES = 1;
1.16 +2 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
Index: MimeMail.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MimeMail.java 6 Feb 2002 13:38:02 -0000 1.15
+++ MimeMail.java 21 Feb 2002 09:41:55 -0000 1.16
@@ -23,8 +23,8 @@
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 @@
* @author [EMAIL PROTECTED] Paulo Gaspar
* @created 01 May 2001
*/
-public class MimeMail extends Task
+public class MimeMail extends AbstractTask
{
/**
* failure flag
1.22 +2 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- P4Base.java 18 Feb 2002 09:02:39 -0000 1.21
+++ P4Base.java 21 Feb 2002 09:41:55 -0000 1.22
@@ -9,8 +9,8 @@
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 @@
* @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 @@
{
//Setup task before executing it
prepare();
- super.execute();
}
/**
1.9 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
Index: AntStarTeamCheckOut.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AntStarTeamCheckOut.java 6 Feb 2002 13:38:04 -0000 1.8
+++ AntStarTeamCheckOut.java 21 Feb 2002 09:41:55 -0000 1.9
@@ -16,6 +16,7 @@
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 @@
* @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>.
1.24 +2 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Coverage.java 18 Feb 2002 09:02:40 -0000 1.23
+++ Coverage.java 21 Feb 2002 09:41:55 -0000 1.24
@@ -14,9 +14,8 @@
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 @@
* @author <a href="[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
public class Coverage
- extends Task
+ extends AbstractTask
{
protected Commandline cmdl = new Commandline();
protected CommandlineJava cmdlJava = new CommandlineJava();
1.23 +3 -4
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CovMerge.java 18 Feb 2002 09:02:40 -0000 1.22
+++ CovMerge.java 21 Feb 2002 09:41:55 -0000 1.23
@@ -14,9 +14,8 @@
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 @@
*
* @author <a href="[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
-public class CovMerge extends Task
+public class CovMerge
+ extends AbstractTask
{
-
/**
* coverage home, it is mandatory
*/
1.24 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CovReport.java 18 Feb 2002 09:02:40 -0000 1.23
+++ CovReport.java 21 Feb 2002 09:41:55 -0000 1.24
@@ -18,9 +18,8 @@
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 @@
*
* @author <a href="[EMAIL PROTECTED]">Stephane Bailliez</a>
*/
-public class CovReport extends Task
+public class CovReport
+ extends AbstractTask
{
/*
* jpcoverport [options] -output=file -snapshot=snapshot.jpc
1.7 +3 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
Index: XMLReport.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLReport.java 23 Dec 2001 14:22:47 -0000 1.6
+++ XMLReport.java 21 Feb 2002 09:41:55 -0000 1.7
@@ -15,7 +15,7 @@
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 @@
/**
* 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 @@
* @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;
1.24 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- MSVSS.java 10 Feb 2002 01:01:12 -0000 1.23
+++ MSVSS.java 21 Feb 2002 09:41:55 -0000 1.24
@@ -10,9 +10,9 @@
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 @@
* @author Craig Cottingham
* @author Andrew Everitt
*/
-public abstract class MSVSS extends Task
+public abstract class MSVSS
+ extends AbstractTask
{
/**
1.4 +1 -3
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
Index: RmicAdapterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RmicAdapterFactory.java 23 Dec 2001 06:34:24 -0000 1.3
+++ RmicAdapterFactory.java 21 Feb 2002 09:41:55 -0000 1.4
@@ -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 @@
*
* @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 )
1.8 +3 -2
jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
Index: ReplaceRegExp.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReplaceRegExp.java 6 Feb 2002 13:38:22 -0000 1.7
+++ ReplaceRegExp.java 21 Feb 2002 09:41:55 -0000 1.8
@@ -16,8 +16,8 @@
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 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Matthew Inger</a>
*/
-public class ReplaceRegExp extends Task
+public class ReplaceRegExp
+ extends AbstractTask
{
private boolean byline;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
