Browse Source

Make tasks extend AbstractTask directly not via Task

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271487 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
0da0af0739
66 changed files with 152 additions and 172 deletions
  1. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
  2. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
  3. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
  4. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
  5. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  6. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  7. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
  8. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  9. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  10. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  11. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  12. +3
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  13. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  14. +3
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
  15. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  16. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  17. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  18. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  19. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
  20. +3
    -7
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
  21. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  22. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  23. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  24. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  25. +2
    -4
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  26. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  27. +3
    -4
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  28. +3
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  29. +2
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  30. +3
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
  31. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  32. +1
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
  33. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
  34. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
  35. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
  36. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
  37. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
  38. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
  39. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java
  40. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
  41. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
  42. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
  43. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
  44. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  45. +3
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  46. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
  47. +3
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
  48. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  49. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  50. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  51. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  52. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java
  53. +3
    -7
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
  54. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  55. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  56. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  57. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  58. +2
    -4
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  59. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  60. +3
    -4
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  61. +3
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  62. +2
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  63. +3
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
  64. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  65. +1
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
  66. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java

+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java View File

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


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java View File

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Log * Log
@@ -19,7 +19,7 @@ import org.apache.tools.ant.Task;
* @author costin@dnt.ro * @author costin@dnt.ro
*/ */
public class Echo public class Echo
extends Task
extends AbstractTask
{ {
private String m_message = "";// required private String m_message = "";// required
private File m_file; private File m_file;


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java View File

@@ -15,8 +15,8 @@ import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.Date; import java.util.Date;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Get a particular file from a URL source. Options include verbose reporting, * 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 costin@dnt.ro
* @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth) * @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth)
*/ */
public class Get extends Task
public class Get extends AbstractTask
{// required {// required
private boolean verbose = false; private boolean verbose = false;
private boolean useTimestamp = false;//off by default private boolean useTimestamp = false;//off by default


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java View File

@@ -12,15 +12,15 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Ant task to read input line from console. * Ant task to read input line from console.
* *
* @author Ulrich Schmidt <usch@usch.net> * @author Ulrich Schmidt <usch@usch.net>
*/ */
public class Input extends Task
public class Input extends AbstractTask
{ {
private String validargs = null; private String validargs = null;
private String message = ""; private String message = "";


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java View File

@@ -8,10 +8,10 @@
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;


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




+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java View File

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;


import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; 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.Path;


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


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java View File

@@ -14,8 +14,8 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; 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.Path;
import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.types.PathUtil;


@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.PathUtil;
* @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a> * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
*/ */
public class Property public class Property
extends Task
extends AbstractTask
{ {
private Path m_classpath; private Path m_classpath;




+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java View File

@@ -481,7 +481,7 @@ public class Rmic extends MatchingTask
} }


String compiler = getContext().getProperty( "build.rmic" ).toString(); 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 // now we need to populate the compiler adapter
adapter.setRmic( this ); adapter.setRmic( this );


+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java View File

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




+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java View File

@@ -17,8 +17,8 @@ import java.util.Locale;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnumeratedAttribute;


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


+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -18,11 +18,10 @@ import java.util.StringTokenizer;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.aut.nativelib.ExecOutputHandler;
import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Execute;
import org.apache.myrmidon.framework.Pattern; 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.Commandline;
import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileSet;
@@ -64,7 +63,7 @@ import org.apache.tools.ant.util.FileUtils;
*/ */


public class Javadoc public class Javadoc
extends Task
extends AbstractTask
implements ExecOutputHandler implements ExecOutputHandler
{ {
private Commandline m_command = new Commandline(); private Commandline m_command = new Commandline();


+ 3
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java View File

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


private CommandlineJava commandline = new CommandlineJava(); private CommandlineJava commandline = new CommandlineJava();


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java View File

@@ -704,7 +704,8 @@ public class IContract extends MatchingTask


// We want to be notified if iContract jar is missing. This makes life easier for the user // 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!) // 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 // 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 // don't exist, but for some reason I don't know, it will complain about the REP files
@@ -748,7 +749,7 @@ public class IContract extends MatchingTask
iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) ); iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) );


// Create a forked java process // Create a forked java process
Java iContract = (Java)getProject().createTask( "java" );
Java iContract = null;//(Java)getProject().createTask( "java" );
iContract.setFork( true ); iContract.setFork( true );
iContract.setClassname( "com.reliablesystems.iContract.Tool" ); iContract.setClassname( "com.reliablesystems.iContract.Tool" );
iContract.setClasspath( iContractClasspath ); iContract.setClasspath( iContractClasspath );


+ 3
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java View File

@@ -14,15 +14,15 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Execute a script * Execute a script
* *
* @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a> * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
*/ */
public class Script extends Task
public class Script extends AbstractTask
{ {
private String script = ""; private String script = "";
private Hashtable beans = new Hashtable(); private Hashtable beans = new Hashtable();
@@ -88,7 +88,7 @@ public class Script extends Task
{ {
try try
{ {
addBeans( getProject().getProperties() );
addBeans( getContext().getPropertys() );
//In Ant2 there is no difference between properties and references //In Ant2 there is no difference between properties and references
//addBeans( getProject().getReferences() ); //addBeans( getProject().getReferences() );




+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java View File

@@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase;


import java.io.File; import java.io.File;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; 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.Commandline;


/** /**
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.Commandline;
* *
* @author Curtis White * @author Curtis White
*/ */
public abstract class ClearCase extends Task
public abstract class ClearCase extends AbstractTask
{ {


/** /**


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java View File

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


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java View File

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


// keys to optional attributes // keys to optional attributes


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java View File

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


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java View File

@@ -7,8 +7,8 @@
*/ */
package org.apache.tools.ant.taskdefs.optional.jsp.compilers; package org.apache.tools.ant.taskdefs.optional.jsp.compilers;


import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Creates the necessary compiler adapter, given basic criteria. * 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 * @throws TaskException if the compiler type could not be resolved into a
* compiler adapter. * compiler adapter.
*/ */
public static CompilerAdapter getCompiler( String compilerType, Task task )
public static CompilerAdapter getCompiler( String compilerType, AbstractTask task )
throws TaskException throws TaskException
{ {
/* /*


+ 3
- 7
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java View File

@@ -17,11 +17,10 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnumeratedAttribute;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;


/** /**
* Transform a JUnit xml report. The default transformation generates an html * Transform a JUnit xml report. The default transformation generates an html
@@ -60,7 +59,7 @@ public class AggregateTransformer
*/ */
private File m_styleDir; private File m_styleDir;


private Task m_task;
private AbstractTask m_task;


/** /**
* the destination directory, this is the root from where html should be * the destination directory, this is the root from where html should be
@@ -68,7 +67,7 @@ public class AggregateTransformer
*/ */
private File m_toDir; private File m_toDir;


public AggregateTransformer( Task task )
public AggregateTransformer( AbstractTask task )
{ {
m_task = task; m_task = task;
} }
@@ -109,10 +108,8 @@ public class AggregateTransformer
throws TaskException throws TaskException
{ {
checkOptions(); checkOptions();
final long t0 = System.currentTimeMillis();
try try
{ {
Element root = m_document.getDocumentElement();
XalanExecutor executor = XalanExecutor.newInstance( this ); XalanExecutor executor = XalanExecutor.newInstance( this );
executor.execute(); executor.execute();
} }
@@ -120,7 +117,6 @@ public class AggregateTransformer
{ {
throw new TaskException( "Errors while applying transformations", e ); throw new TaskException( "Errors while applying transformations", e );
} }
final long dt = System.currentTimeMillis() - t0;
//task.getLogger().info( "Transform time: " + dt + "ms" ); //task.getLogger().info( "Transform time: " + dt + "ms" );
} }




+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java View File

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


+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java View File

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


+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java View File

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


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java View File

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


+ 2
- 4
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java View File

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce;


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


/** /**


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java View File

@@ -16,6 +16,7 @@ import com.starbase.starteam.Type;
import com.starbase.starteam.View; import com.starbase.starteam.View;
import com.starbase.util.Platform; import com.starbase.util.Platform;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.ScannerUtil; import org.apache.tools.ant.types.ScannerUtil;


@@ -60,9 +61,9 @@ import org.apache.tools.ant.types.ScannerUtil;
* @version 1.0 * @version 1.0
* @see <A HREF="http://www.starbase.com/">StarBase Web Site</A> * @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 * This constant sets the filter to include all files. This default has the
* same result as <CODE>setIncludes("*")</CODE>. * same result as <CODE>setIncludes("*")</CODE>.


+ 3
- 4
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

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

/** /**
* coverage home, it is mandatory * coverage home, it is mandatory
*/ */


+ 3
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java View File

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


+ 2
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java View File

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


+ 3
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java View File

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


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java View File

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.vss;
import java.io.File; import java.io.File;
import java.util.Properties; import java.util.Properties;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; 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.Commandline;


/** /**
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Commandline;
* @author Craig Cottingham * @author Craig Cottingham
* @author Andrew Everitt * @author Andrew Everitt
*/ */
public abstract class MSVSS extends Task
public abstract class MSVSS
extends AbstractTask
{ {


/** /**


+ 1
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java View File

@@ -8,7 +8,6 @@
package org.apache.tools.ant.taskdefs.rmic; package org.apache.tools.ant.taskdefs.rmic;


import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Creates the necessary rmic adapter, given basic criteria. * 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 * @param rmicType either the name of the desired rmic, or the full
* classname of the rmic's adapter. * classname of the rmic's adapter.
* @param task a task to log through.
* @return The Rmic value * @return The Rmic value
* @throws TaskException if the rmic type could not be resolved into a rmic * @throws TaskException if the rmic type could not be resolved into a rmic
* adapter. * adapter.
*/ */
public static RmicAdapter getRmic( String rmicType, Task task )
public static RmicAdapter getRmic( String rmicType )
throws TaskException throws TaskException
{ {
if( rmicType == null ) if( rmicType == null )


+ 3
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java View File

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




+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java View File

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


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java View File

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Log * Log
@@ -19,7 +19,7 @@ import org.apache.tools.ant.Task;
* @author costin@dnt.ro * @author costin@dnt.ro
*/ */
public class Echo public class Echo
extends Task
extends AbstractTask
{ {
private String m_message = "";// required private String m_message = "";// required
private File m_file; private File m_file;


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java View File

@@ -15,8 +15,8 @@ import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.util.Date; import java.util.Date;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Get a particular file from a URL source. Options include verbose reporting, * 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 costin@dnt.ro
* @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth) * @author gg@grtmail.com (Added Java 1.1 style HTTP basic auth)
*/ */
public class Get extends Task
public class Get extends AbstractTask
{// required {// required
private boolean verbose = false; private boolean verbose = false;
private boolean useTimestamp = false;//off by default private boolean useTimestamp = false;//off by default


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java View File

@@ -12,15 +12,15 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Ant task to read input line from console. * Ant task to read input line from console.
* *
* @author Ulrich Schmidt <usch@usch.net> * @author Ulrich Schmidt <usch@usch.net>
*/ */
public class Input extends Task
public class Input extends AbstractTask
{ {
private String validargs = null; private String validargs = null;
private String message = ""; private String message = "";


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java View File

@@ -8,10 +8,10 @@
package org.apache.tools.ant.taskdefs; package org.apache.tools.ant.taskdefs;


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




+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java View File

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;


import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; 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.Path;


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


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java View File

@@ -14,8 +14,8 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; 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.Path;
import org.apache.tools.ant.types.PathUtil; import org.apache.tools.ant.types.PathUtil;


@@ -28,7 +28,7 @@ import org.apache.tools.ant.types.PathUtil;
* @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a> * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
*/ */
public class Property public class Property
extends Task
extends AbstractTask
{ {
private Path m_classpath; private Path m_classpath;




+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java View File

@@ -481,7 +481,7 @@ public class Rmic extends MatchingTask
} }


String compiler = getContext().getProperty( "build.rmic" ).toString(); 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 // now we need to populate the compiler adapter
adapter.setRmic( this ); adapter.setRmic( this );


+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java View File

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




+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java View File

@@ -17,8 +17,8 @@ import java.util.Locale;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.TimeZone; import java.util.TimeZone;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnumeratedAttribute;


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


+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -18,11 +18,10 @@ import java.util.StringTokenizer;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.aut.nativelib.ExecOutputHandler;
import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.Os;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Execute;
import org.apache.myrmidon.framework.Pattern; 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.Commandline;
import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FileSet;
@@ -64,7 +63,7 @@ import org.apache.tools.ant.util.FileUtils;
*/ */


public class Javadoc public class Javadoc
extends Task
extends AbstractTask
implements ExecOutputHandler implements ExecOutputHandler
{ {
private Commandline m_command = new Commandline(); private Commandline m_command = new Commandline();


+ 3
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java View File

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


private CommandlineJava commandline = new CommandlineJava(); private CommandlineJava commandline = new CommandlineJava();


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java View File

@@ -704,7 +704,8 @@ public class IContract extends MatchingTask


// We want to be notified if iContract jar is missing. This makes life easier for the user // 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!) // 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 // 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 // don't exist, but for some reason I don't know, it will complain about the REP files
@@ -748,7 +749,7 @@ public class IContract extends MatchingTask
iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) ); iContractClasspath.append( new Path( buildDir.getAbsolutePath() ) );


// Create a forked java process // Create a forked java process
Java iContract = (Java)getProject().createTask( "java" );
Java iContract = null;//(Java)getProject().createTask( "java" );
iContract.setFork( true ); iContract.setFork( true );
iContract.setClassname( "com.reliablesystems.iContract.Tool" ); iContract.setClassname( "com.reliablesystems.iContract.Tool" );
iContract.setClasspath( iContractClasspath ); iContract.setClasspath( iContractClasspath );


+ 3
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java View File

@@ -14,15 +14,15 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Execute a script * Execute a script
* *
* @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a> * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
*/ */
public class Script extends Task
public class Script extends AbstractTask
{ {
private String script = ""; private String script = "";
private Hashtable beans = new Hashtable(); private Hashtable beans = new Hashtable();
@@ -88,7 +88,7 @@ public class Script extends Task
{ {
try try
{ {
addBeans( getProject().getProperties() );
addBeans( getContext().getPropertys() );
//In Ant2 there is no difference between properties and references //In Ant2 there is no difference between properties and references
//addBeans( getProject().getReferences() ); //addBeans( getProject().getReferences() );




+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java View File

@@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase;


import java.io.File; import java.io.File;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; 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.Commandline;


/** /**
@@ -27,7 +27,7 @@ import org.apache.tools.ant.types.Commandline;
* *
* @author Curtis White * @author Curtis White
*/ */
public abstract class ClearCase extends Task
public abstract class ClearCase extends AbstractTask
{ {


/** /**


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java View File

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


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java View File

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


// keys to optional attributes // keys to optional attributes


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java View File

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


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapterFactory.java View File

@@ -7,8 +7,8 @@
*/ */
package org.apache.tools.ant.taskdefs.optional.jsp.compilers; package org.apache.tools.ant.taskdefs.optional.jsp.compilers;


import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Creates the necessary compiler adapter, given basic criteria. * 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 * @throws TaskException if the compiler type could not be resolved into a
* compiler adapter. * compiler adapter.
*/ */
public static CompilerAdapter getCompiler( String compilerType, Task task )
public static CompilerAdapter getCompiler( String compilerType, AbstractTask task )
throws TaskException throws TaskException
{ {
/* /*


+ 3
- 7
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java View File

@@ -17,11 +17,10 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute; import org.apache.tools.ant.types.EnumeratedAttribute;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element;


/** /**
* Transform a JUnit xml report. The default transformation generates an html * Transform a JUnit xml report. The default transformation generates an html
@@ -60,7 +59,7 @@ public class AggregateTransformer
*/ */
private File m_styleDir; private File m_styleDir;


private Task m_task;
private AbstractTask m_task;


/** /**
* the destination directory, this is the root from where html should be * the destination directory, this is the root from where html should be
@@ -68,7 +67,7 @@ public class AggregateTransformer
*/ */
private File m_toDir; private File m_toDir;


public AggregateTransformer( Task task )
public AggregateTransformer( AbstractTask task )
{ {
m_task = task; m_task = task;
} }
@@ -109,10 +108,8 @@ public class AggregateTransformer
throws TaskException throws TaskException
{ {
checkOptions(); checkOptions();
final long t0 = System.currentTimeMillis();
try try
{ {
Element root = m_document.getDocumentElement();
XalanExecutor executor = XalanExecutor.newInstance( this ); XalanExecutor executor = XalanExecutor.newInstance( this );
executor.execute(); executor.execute();
} }
@@ -120,7 +117,6 @@ public class AggregateTransformer
{ {
throw new TaskException( "Errors while applying transformations", e ); throw new TaskException( "Errors while applying transformations", e );
} }
final long dt = System.currentTimeMillis() - t0;
//task.getLogger().info( "Transform time: " + dt + "ms" ); //task.getLogger().info( "Transform time: " + dt + "ms" );
} }




+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java View File

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


+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java View File

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


+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java View File

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


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java View File

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


+ 2
- 4
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java View File

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.perforce;


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


/** /**


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java View File

@@ -16,6 +16,7 @@ import com.starbase.starteam.Type;
import com.starbase.starteam.View; import com.starbase.starteam.View;
import com.starbase.util.Platform; import com.starbase.util.Platform;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.ScannerUtil; import org.apache.tools.ant.types.ScannerUtil;


@@ -60,9 +61,9 @@ import org.apache.tools.ant.types.ScannerUtil;
* @version 1.0 * @version 1.0
* @see <A HREF="http://www.starbase.com/">StarBase Web Site</A> * @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 * This constant sets the filter to include all files. This default has the
* same result as <CODE>setIncludes("*")</CODE>. * same result as <CODE>setIncludes("*")</CODE>.


+ 3
- 4
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

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

/** /**
* coverage home, it is mandatory * coverage home, it is mandatory
*/ */


+ 3
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java View File

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


+ 2
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java View File

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


+ 3
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java View File

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


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java View File

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.vss;
import java.io.File; import java.io.File;
import java.util.Properties; import java.util.Properties;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute; 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.Commandline;


/** /**
@@ -29,7 +29,8 @@ import org.apache.tools.ant.types.Commandline;
* @author Craig Cottingham * @author Craig Cottingham
* @author Andrew Everitt * @author Andrew Everitt
*/ */
public abstract class MSVSS extends Task
public abstract class MSVSS
extends AbstractTask
{ {


/** /**


+ 1
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java View File

@@ -8,7 +8,6 @@
package org.apache.tools.ant.taskdefs.rmic; package org.apache.tools.ant.taskdefs.rmic;


import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Task;


/** /**
* Creates the necessary rmic adapter, given basic criteria. * 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 * @param rmicType either the name of the desired rmic, or the full
* classname of the rmic's adapter. * classname of the rmic's adapter.
* @param task a task to log through.
* @return The Rmic value * @return The Rmic value
* @throws TaskException if the rmic type could not be resolved into a rmic * @throws TaskException if the rmic type could not be resolved into a rmic
* adapter. * adapter.
*/ */
public static RmicAdapter getRmic( String rmicType, Task task )
public static RmicAdapter getRmic( String rmicType )
throws TaskException throws TaskException
{ {
if( rmicType == null ) if( rmicType == null )


+ 3
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java View File

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




Loading…
Cancel
Save