You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by do...@apache.org on 2002/02/03 11:26:22 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb BorlandGenerateClient.java BorlandDeploymentTool.java
donaldp 02/02/03 02:26:22
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
Rpm.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Patch.java Java.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Base.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
MParse.java AbstractMetamataTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java JavaCC.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
Javadoc.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
IContract.java Cab.java ANTLR.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
Execute2.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovReport.java CovMerge.java Coverage.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
Continuus.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandGenerateClient.java
BorlandDeploymentTool.java
Log:
Add a constructor to Execute2 that takes the ExecManager service
Revision Changes Path
1.11 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java
Index: Rpm.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Rpm.java 27 Jan 2002 02:31:49 -0000 1.10
+++ Rpm.java 3 Feb 2002 10:26:20 -0000 1.11
@@ -13,6 +13,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
@@ -90,7 +91,8 @@
throws TaskException
{
final Commandline cmd = createCommand();
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( m_topDir == null ) {
1.18 +5 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
Index: Pvcs.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Pvcs.java 27 Jan 2002 02:31:48 -0000 1.17
+++ Pvcs.java 3 Feb 2002 10:26:20 -0000 1.18
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.aut.nativelib.ExecOutputHandler;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
@@ -190,7 +191,8 @@
getLogger().debug( "Executing " + cmd.toString() );
try
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd );
@@ -271,7 +273,8 @@
tmp = File.createTempFile( "pvcs_ant_", ".log" );
final File fileList = File.createTempFile( "pvcs_ant_", ".log" );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this );
m_output = new FileOutputStream( tmp );
1.16 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java
Index: Patch.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Patch.java 27 Jan 2002 02:31:47 -0000 1.15
+++ Patch.java 3 Feb 2002 10:26:20 -0000 1.16
@@ -13,6 +13,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* Task as a layer on top of patch. Patch applies a diff file to an original.
@@ -109,7 +110,8 @@
{
validate();
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
final Commandline cmd = buildCommand();
1.27 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Java.java 27 Jan 2002 02:31:47 -0000 1.26
+++ Java.java 3 Feb 2002 10:26:20 -0000 1.27
@@ -19,6 +19,7 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.EnvironmentVariable;
import org.apache.tools.ant.types.Path;
+import org.apache.aut.nativelib.ExecManager;
/**
* This task acts as a loader for java applications but allows to use the same
@@ -217,7 +218,8 @@
private int run( final Commandline command )
throws TaskException
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( m_dir == null )
1.17 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
Index: P4Base.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- P4Base.java 27 Jan 2002 02:31:48 -0000 1.16
+++ P4Base.java 3 Feb 2002 10:26:20 -0000 1.17
@@ -10,6 +10,7 @@
import java.io.IOException;
import org.apache.myrmidon.api.TaskException;
import org.apache.aut.nativelib.ExecOutputHandler;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.oro.text.perl.Perl5Util;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
@@ -165,7 +166,8 @@
handler = this;
}
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
exe.setExecOutputHandler( handler );
exe.setCommandline( cmd );
1.18 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NetCommand.java 27 Jan 2002 02:31:48 -0000 1.17
+++ NetCommand.java 3 Feb 2002 10:26:20 -0000 1.18
@@ -14,6 +14,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* This is a helper class to spawn net commands out. In its initial form it
@@ -199,7 +200,8 @@
{
// default directory to the project's base directory
File dir = _owner.getBaseDirectory();
- _exe = new Execute2();
+ final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class );
+ _exe = new Execute2( execManager );
setupLogger( _exe );
_exe.setWorkingDirectory( dir );
}
1.19 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- MSVSS.java 27 Jan 2002 02:31:48 -0000 1.18
+++ MSVSS.java 3 Feb 2002 10:26:20 -0000 1.19
@@ -14,6 +14,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* A base class for creating tasks for executing commands on Visual SourceSafe.
@@ -204,7 +205,8 @@
{
try
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
// If location of ss.ini is specified we need to set the
1.22 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
Index: MParse.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- MParse.java 27 Jan 2002 02:31:48 -0000 1.21
+++ MParse.java 3 Feb 2002 10:26:21 -0000 1.22
@@ -21,6 +21,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Commandline;
import org.apache.avalon.excalibur.io.IOUtil;
+import org.apache.aut.nativelib.ExecManager;
/**
* Simple Metamata MParse task based on the original written by <a
@@ -286,7 +287,8 @@
return;
}
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline();
1.24 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
Index: AbstractMetamataTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AbstractMetamataTask.java 27 Jan 2002 02:31:48 -0000 1.23
+++ AbstractMetamataTask.java 3 Feb 2002 10:26:21 -0000 1.24
@@ -25,6 +25,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.ScannerUtil;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* Somewhat abstract framework to be used for other metama 2.0 tasks. This
@@ -278,7 +279,8 @@
protected void execute0()
throws TaskException
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline();
1.33 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- JUnitTask.java 3 Feb 2002 03:46:54 -0000 1.32
+++ JUnitTask.java 3 Feb 2002 10:26:21 -0000 1.33
@@ -32,6 +32,7 @@
import org.apache.tools.ant.types.SysProperties;
import org.apache.tools.ant.types.PathUtil;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* Ant task to run JUnit tests. <p>
@@ -649,7 +650,8 @@
throw new TaskException( "Error creating temporary properties file.", ioe );
}
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setCommandline( new Commandline( cmd.getCommandline() ) );
if( dir != null )
1.23 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JJTree.java 27 Jan 2002 02:31:48 -0000 1.22
+++ JJTree.java 3 Feb 2002 10:26:21 -0000 1.23
@@ -19,6 +19,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* Taskdef for the JJTree compiler compiler.
@@ -181,7 +182,8 @@
cmdl.addVmArgument( "-mx140M" );
cmdl.addVmArgument( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() );
1.18 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Index: JavaCC.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavaCC.java 27 Jan 2002 02:31:48 -0000 1.17
+++ JavaCC.java 3 Feb 2002 10:26:21 -0000 1.18
@@ -21,6 +21,7 @@
import org.apache.tools.ant.types.PathUtil;
import org.apache.tools.ant.types.Commandline;
import org.apache.avalon.excalibur.util.StringUtil;
+import org.apache.aut.nativelib.ExecManager;
/**
* Taskdef for the JavaCC compiler compiler.
@@ -244,7 +245,8 @@
try
{
getLogger().debug( cmdline.toString() );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
final String[] commandline = cmdline.getCommandline();
exe.setCommandline( new Commandline( commandline ) );
1.22 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
Index: JDependTask.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JDependTask.java 27 Jan 2002 02:31:48 -0000 1.21
+++ JDependTask.java 3 Feb 2002 10:26:21 -0000 1.22
@@ -19,6 +19,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.aut.nativelib.ExecManager;
/**
* Ant task to run JDepend tests. <p>
@@ -239,7 +240,8 @@
commandline.addArgument( f.getPath() );
}
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
final String[] commandline1 = commandline.getCommandline();
1.22 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Javadoc.java 27 Jan 2002 09:42:56 -0000 1.21
+++ Javadoc.java 3 Feb 2002 10:26:21 -0000 1.22
@@ -19,6 +19,7 @@
import org.apache.myrmidon.framework.Pattern;
import org.apache.aut.nativelib.Os;
import org.apache.aut.nativelib.ExecOutputHandler;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.util.FileUtils;
@@ -811,7 +812,8 @@
getLogger().info( "Javadoc execution" );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this );
1.18 +3 -8 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
Index: IContract.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- IContract.java 3 Feb 2002 07:10:20 -0000 1.17
+++ IContract.java 3 Feb 2002 10:26:21 -0000 1.18
@@ -20,7 +20,6 @@
import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
-import org.apache.antlib.file.Mkdir;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.types.Path;
@@ -708,13 +707,9 @@
// 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
// afterwards
- Mkdir mkdir = (Mkdir)getProject().createTask( "mkdir" );
- mkdir.setDir( instrumentDir );
- mkdir.execute();
- mkdir.setDir( buildDir );
- mkdir.execute();
- mkdir.setDir( repositoryDir );
- mkdir.execute();
+ instrumentDir.mkdirs();
+ buildDir.mkdirs();
+ repositoryDir.mkdirs();
// Set the classpath that is needed for regular Javac compilation
Path baseClasspath = createClasspath();
1.24 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
Index: Cab.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Cab.java 27 Jan 2002 02:31:47 -0000 1.23
+++ Cab.java 3 Feb 2002 10:26:21 -0000 1.24
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.aut.nativelib.Os;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.DirectoryScanner;
import org.apache.tools.ant.taskdefs.MatchingTask;
@@ -134,7 +135,8 @@
try
{
File listFile = createListFile( files );
- Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir );
final Commandline cmd = createCommand( listFile );
1.21 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
Index: ANTLR.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ANTLR.java 27 Jan 2002 02:31:47 -0000 1.20
+++ ANTLR.java 3 Feb 2002 10:26:21 -0000 1.21
@@ -20,6 +20,7 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* ANTLR task.
@@ -226,7 +227,8 @@
private int run( final Commandline command )
throws TaskException
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( workingdir != null )
1.5 +5 -0 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java
Index: Execute2.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Execute2.java 27 Jan 2002 02:31:47 -0000 1.4
+++ Execute2.java 3 Feb 2002 10:26:21 -0000 1.5
@@ -35,6 +35,11 @@
private boolean m_newEnvironment;
private ExecOutputHandler m_handler;
private long m_timeout;
+ private ExecManager m_execManager;
+
+ public Execute2( ExecManager execManager )
+ {
+ }
public void setTimeout( final long timeout )
{
1.28 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Index: DefaultCompilerAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultCompilerAdapter.java 27 Jan 2002 02:31:47 -0000 1.27
+++ DefaultCompilerAdapter.java 3 Feb 2002 10:26:21 -0000 1.28
@@ -21,6 +21,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.PathUtil;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.aut.nativelib.ExecManager;
/**
* This is the default implementation for the CompilerAdapter interface.
@@ -360,7 +361,8 @@
try
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir );
final String[] commandline = commandArray;
1.19 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
Index: CovReport.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CovReport.java 27 Jan 2002 02:31:48 -0000 1.18
+++ CovReport.java 3 Feb 2002 10:26:21 -0000 1.19
@@ -23,6 +23,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Path;
+import org.apache.aut.nativelib.ExecManager;
import org.w3c.dom.Document;
/**
@@ -246,7 +247,8 @@
}
// use the custom handler for stdin issues
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl );
1.18 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CovMerge.java 27 Jan 2002 02:31:48 -0000 1.17
+++ CovMerge.java 3 Feb 2002 10:26:21 -0000 1.18
@@ -20,6 +20,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.ScannerUtil;
+import org.apache.aut.nativelib.ExecManager;
/**
* Convenient task to run the snapshot merge utility for JProbe Coverage.
@@ -114,7 +115,8 @@
}
cmdl.addArgument( "-jp_paramfile=" + paramfile.getAbsolutePath() );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl );
1.19 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
Index: Coverage.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Coverage.java 27 Jan 2002 02:31:48 -0000 1.18
+++ Coverage.java 3 Feb 2002 10:26:21 -0000 1.19
@@ -21,6 +21,7 @@
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
+import org.apache.aut.nativelib.ExecManager;
/**
* Convenient task to run Sitraka JProbe Coverage from Ant. Options are pretty
@@ -250,7 +251,8 @@
cmdl.addArgument( "-jp_input=" + paramfile.getAbsolutePath() );
// use the custom handler for stdin issues
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl );
1.18 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
Index: Continuus.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Continuus.java 27 Jan 2002 02:31:47 -0000 1.17
+++ Continuus.java 3 Feb 2002 10:26:21 -0000 1.18
@@ -12,6 +12,7 @@
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.aut.nativelib.ExecOutputHandler;
+import org.apache.aut.nativelib.ExecManager;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
@@ -111,7 +112,8 @@
{
try
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( null != handler )
{
1.15 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ClearCase.java 27 Jan 2002 02:31:48 -0000 1.14
+++ ClearCase.java 3 Feb 2002 10:26:21 -0000 1.15
@@ -13,6 +13,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Commandline;
+import org.apache.aut.nativelib.ExecManager;
/**
* A base class for creating tasks for executing commands on ClearCase. <p>
@@ -107,7 +108,8 @@
{
try
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd );
1.20 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BorlandGenerateClient.java 27 Jan 2002 02:31:48 -0000 1.19
+++ BorlandGenerateClient.java 3 Feb 2002 10:26:21 -0000 1.20
@@ -14,6 +14,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Argument;
+import org.apache.aut.nativelib.ExecManager;
/**
* BorlandGenerateClient is dedicated to the Borland Application Server 4.5 This
@@ -160,7 +161,8 @@
getLogger().info( "mode : fork" );
getLogger().debug( "Calling java2iiop" );
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( new File( "." ) );
exe.setCommandline( cmd );
1.18 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- BorlandDeploymentTool.java 27 Jan 2002 02:31:48 -0000 1.17
+++ BorlandDeploymentTool.java 3 Feb 2002 10:26:22 -0000 1.18
@@ -24,6 +24,7 @@
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
+import org.apache.aut.nativelib.ExecManager;
/**
* BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and
@@ -361,7 +362,8 @@
*/
private void buildBorlandStubs( Iterator ithomes, Hashtable files )
{
- final Execute2 exe = new Execute2();
+ final ExecManager execManager = (ExecManager)getService( ExecManager.class );
+ final Execute2 exe = new Execute2( execManager );
exe.setWorkingDirectory( getTask().getBaseDirectory() );
final Commandline cmd = buildCommandline( ithomes );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>