Use Execute2 abstraction

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

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

@@ -12,8 +12,7 @@ import java.io.IOException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -44,7 +43,7 @@ public class NetCommand
     /**
      * executabe
      */
-    protected Execute _exe;
+    protected Execute2 _exe;
 
     /**
      * flag to control action on execution trouble
@@ -200,9 +199,8 @@ public class NetCommand
     {
         // default directory to the project's base directory
         File dir = _owner.getBaseDirectory();
-        _exe = new Execute();
-        _exe.setOutput( new LogOutputStream( _owner.hackGetLogger(), false ) );
-        _exe.setError( new LogOutputStream( _owner.hackGetLogger(), true ) );
+        _exe = new Execute2();
+        setupLogger( _exe );
         _exe.setWorkingDirectory( dir );
     }
 }

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

@@ -13,8 +13,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -174,7 +173,7 @@ public class JJTree extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( getProject() );
+        final Path classpath = cmdl.createClasspath();
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
@@ -183,9 +182,8 @@ public class JJTree extends Task
         arg.setValue( "-mx140M" );
         arg.setValue( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
 
-        final Execute exe = new Execute();
-        exe.setOutput( new LogOutputStream( getLogger(), false ) );
-        exe.setError( new LogOutputStream( getLogger(), false ) );
+        final Execute2 exe = new Execute2();
+        setupLogger( exe );
 
         getLogger().debug( cmdl.toString() );
         exe.setCommandline( cmdl.getCommandline() );

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

@@ -14,8 +14,7 @@ import java.io.PrintWriter;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.PathTokenizer;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.EnumeratedAttribute;
@@ -326,9 +325,8 @@ public class JDependTask extends Task
             commandline.createArgument().setValue( f.getPath() );
         }
 
-        final Execute exe = new Execute();
-        exe.setOutput( new LogOutputStream( getLogger(), false ) );
-        exe.setError( new LogOutputStream( getLogger(), true ) );
+        final Execute2 exe = new Execute2();
+        setupLogger( exe );
 
         exe.setCommandline( commandline.getCommandline() );
         if( getDir() != null )

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

@@ -12,8 +12,7 @@ import java.io.IOException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Commandline;
 
 /**
@@ -44,7 +43,7 @@ public class NetCommand
     /**
      * executabe
      */
-    protected Execute _exe;
+    protected Execute2 _exe;
 
     /**
      * flag to control action on execution trouble
@@ -200,9 +199,8 @@ public class NetCommand
     {
         // default directory to the project's base directory
         File dir = _owner.getBaseDirectory();
-        _exe = new Execute();
-        _exe.setOutput( new LogOutputStream( _owner.hackGetLogger(), false ) );
-        _exe.setError( new LogOutputStream( _owner.hackGetLogger(), true ) );
+        _exe = new Execute2();
+        setupLogger( _exe );
         _exe.setWorkingDirectory( dir );
     }
 }

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

@@ -13,8 +13,7 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.Path;
@@ -174,7 +173,7 @@ public class JJTree extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( getProject() );
+        final Path classpath = cmdl.createClasspath();
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
@@ -183,9 +182,8 @@ public class JJTree extends Task
         arg.setValue( "-mx140M" );
         arg.setValue( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
 
-        final Execute exe = new Execute();
-        exe.setOutput( new LogOutputStream( getLogger(), false ) );
-        exe.setError( new LogOutputStream( getLogger(), false ) );
+        final Execute2 exe = new Execute2();
+        setupLogger( exe );
 
         getLogger().debug( cmdl.toString() );
         exe.setCommandline( cmdl.getCommandline() );

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

@@ -14,8 +14,7 @@ import java.io.PrintWriter;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.PathTokenizer;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
 import org.apache.tools.ant.types.Argument;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.EnumeratedAttribute;
@@ -326,9 +325,8 @@ public class JDependTask extends Task
             commandline.createArgument().setValue( f.getPath() );
         }
 
-        final Execute exe = new Execute();
-        exe.setOutput( new LogOutputStream( getLogger(), false ) );
-        exe.setError( new LogOutputStream( getLogger(), true ) );
+        final Execute2 exe = new Execute2();
+        setupLogger( exe );
 
         exe.setCommandline( commandline.getCommandline() );
         if( getDir() != null )