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 2001/12/23 07:20:35 UTC
cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix Rpm.java
donaldp 01/12/22 22:20:35
Modified: proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
Java.java Javadoc.java Patch.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
DefaultCompilerAdapter.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
ANTLR.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
ClearCase.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
NetCommand.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
JDependTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
AbstractMetamataTask.java MAudit.java MMetrics.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
SimpleP4OutputHandler.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
Pvcs.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CovMerge.java CovReport.java Coverage.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
Rpm.java
Log:
Set the output streams to Execute via setters not via constructor
Revision Changes Path
1.13 +10 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Java.java 2001/12/22 23:35:28 1.12
+++ Java.java 2001/12/23 06:20:34 1.13
@@ -16,15 +16,13 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.EnvironmentData;
+import org.apache.tools.ant.types.EnvironmentVariable;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.types.EnvironmentVariable;
-import org.apache.tools.ant.types.Argument;
/**
* This task acts as a loader for java applications but allows to use the same
@@ -377,13 +375,17 @@
Execute exe = null;
if( out == null )
{
- exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
- Project.MSG_WARN ) );
+ exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
+
}
else
{
fos = new FileOutputStream( out );
- exe = new Execute( new PumpStreamHandler( fos ) );
+ exe = new Execute();
+ exe.setOutput( fos );
+ exe.setError( fos );
}
if( dir == null )
1.12 +3 -1 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Javadoc.java 2001/12/22 12:59:30 1.11
+++ Javadoc.java 2001/12/23 06:20:34 1.12
@@ -916,7 +916,9 @@
JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
- Execute exe = new Execute( new PumpStreamHandler( out, err ) );
+ Execute exe = new Execute();
+ exe.setOutput( out );
+ exe.setError( err );
/*
* No reason to change the working directory as all filenames and
1.7 +4 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Patch.java 2001/12/22 23:35:29 1.6
+++ Patch.java 2001/12/23 06:20:34 1.7
@@ -13,7 +13,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -142,8 +142,9 @@
toExecute.createArgument().setFile( originalFile );
}
- Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
- Project.MSG_WARN ) );
+ Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
exe.setCommandline( toExecute.getCommandline() );
try
{
1.12 +4 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultCompilerAdapter.java 2001/12/22 22:14:26 1.11
+++ DefaultCompilerAdapter.java 2001/12/23 06:20:34 1.12
@@ -16,6 +16,7 @@
import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path;
@@ -434,9 +435,9 @@
try
{
- Execute exe = new Execute( new LogStreamHandler( attributes,
- Project.MSG_INFO,
- Project.MSG_WARN ) );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( attributes, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( attributes, Project.MSG_WARN ) );
exe.setWorkingDirectory( project.getBaseDir() );
exe.setCommandline( commandArray );
return exe.execute();
1.11 +5 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ANTLR.java 2001/12/22 23:35:29 1.10
+++ ANTLR.java 2001/12/23 06:20:34 1.11
@@ -18,6 +18,7 @@
import org.apache.tools.ant.taskdefs.ExecuteJava;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
@@ -228,8 +229,10 @@
private int run( String[] command )
throws TaskException
{
- Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
- Project.MSG_WARN ) );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
+
if( workingdir != null )
{
exe.setWorkingDirectory( workingdir );
1.9 +4 -2 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
Index: ClearCase.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ClearCase.java 2001/12/22 12:57:37 1.8
+++ ClearCase.java 2001/12/23 06:20:34 1.9
@@ -13,6 +13,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -108,8 +109,9 @@
{
try
{
- Project aProj = getProject();
- Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
1.11 +5 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NetCommand.java 2001/12/22 23:35:29 1.10
+++ NetCommand.java 2001/12/23 06:20:34 1.11
@@ -15,6 +15,7 @@
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -201,9 +202,9 @@
{
// default directory to the project's base directory
File dir = _owner.getBaseDirectory();
- ExecuteStreamHandler handler = new LogStreamHandler( _owner,
- Project.MSG_INFO, Project.MSG_WARN );
- _exe = new Execute( handler );
+ _exe = new Execute();
+ _exe.setOutput( new LogOutputStream( _owner, Project.MSG_INFO ) );
+ _exe.setError( new LogOutputStream( _owner, Project.MSG_WARN ) );
_exe.setWorkingDirectory( dir );
}
-}//class
+}
1.11 +7 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JJTree.java 2001/12/22 23:35:29 1.10
+++ JJTree.java 2001/12/23 06:20:34 1.11
@@ -16,6 +16,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.Path;
@@ -185,16 +186,16 @@
arg.setValue( "-mx140M" );
arg.setValue( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
- final Execute process =
- new Execute( new LogStreamHandler( this,
- Project.MSG_INFO,
- Project.MSG_INFO ) );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_INFO ) );
+
log( cmdl.toString(), Project.MSG_VERBOSE );
- process.setCommandline( cmdl.getCommandline() );
+ exe.setCommandline( cmdl.getCommandline() );
try
{
- if( process.execute() != 0 )
+ if( exe.execute() != 0 )
{
throw new TaskException( "JJTree failed." );
}
1.10 +9 -8 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JDependTask.java 2001/12/23 00:10:10 1.9
+++ JDependTask.java 2001/12/23 06:20:34 1.10
@@ -16,14 +16,13 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.myrmidon.framework.exec.ExecuteWatchdog;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.types.Argument;
/**
* Ant task to run JDepend tests. <p>
@@ -328,13 +327,15 @@
throw new TaskException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." );
commandline.createArgument().setValue( f.getPath() );
}
+
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
- Execute execute =
- new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
- execute.setCommandline( commandline.getCommandline() );
+ exe.setCommandline( commandline.getCommandline() );
if( getDir() != null )
{
- execute.setWorkingDirectory( getDir() );
+ exe.setWorkingDirectory( getDir() );
}
if( getOutputFile() != null )
@@ -342,7 +343,7 @@
log( "Executing: " + commandline.toString(), Project.MSG_VERBOSE );
try
{
- return execute.execute();
+ return exe.execute();
}
catch( IOException e )
{
1.15 +13 -34 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JUnitTask.java 2001/12/23 03:40:24 1.14
+++ JUnitTask.java 2001/12/23 06:20:34 1.15
@@ -13,26 +13,23 @@
import java.io.OutputStream;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Properties;
import java.util.Random;
-import java.util.Enumeration;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.myrmidon.framework.exec.ExecuteWatchdog;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
-import org.apache.tools.ant.types.Commandline;
+import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.CommandlineJava;
import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.EnvironmentData;
-import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.EnvironmentVariable;
-import org.apache.tools.ant.types.Argument;
+import org.apache.tools.ant.types.Path;
/**
* Ant task to run JUnit tests. <p>
@@ -496,25 +493,10 @@
protected Iterator allTests()
{
Iterator[] enums = {tests.iterator(), batchTests.iterator()};
- return Iterators.fromCompound( enums );
+ return Iterator.fromCompound( enums );
}
/**
- * @return <tt>null</tt> if there is a timeout value, otherwise the watchdog
- * instance.
- * @exception TaskException Description of Exception
- */
- protected ExecuteWatchdog createWatchdog()
- throws TaskException
- {
- if( timeout == null )
- {
- return null;
- }
- return new ExecuteWatchdog( timeout.intValue() );
- }
-
- /**
* Run the tests.
*
* @param test Description of Parameter
@@ -544,13 +526,7 @@
}
else
{
- ExecuteWatchdog watchdog = createWatchdog();
- exitValue = executeAsForked( test, watchdog );
- // null watchdog means no timeout, you'd better not check with null
- if( watchdog != null )
- {
- wasKilled = watchdog.killedProcess();
- }
+ exitValue = executeAsForked( test );
}
// if there is an error/failure and that it should halt, stop everything otherwise
@@ -622,7 +598,7 @@
* @return Description of the Returned Value
* @exception TaskException Description of Exception
*/
- private int executeAsForked( JUnitTest test, ExecuteWatchdog watchdog )
+ private int executeAsForked( JUnitTest test )
throws TaskException
{
CommandlineJava cmd = (CommandlineJava)commandline.clone();
@@ -675,19 +651,22 @@
{
throw new TaskException( "Error creating temporary properties file.", ioe );
}
+
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
- final Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog );
- execute.setCommandline( cmd.getCommandline() );
+ exe.setCommandline( cmd.getCommandline() );
if( dir != null )
{
- execute.setWorkingDirectory( dir );
+ exe.setWorkingDirectory( dir );
}
log( "Executing: " + cmd.toString(), Project.MSG_VERBOSE );
int retVal;
try
{
- retVal = execute.execute();
+ retVal = exe.execute();
}
catch( IOException e )
{
1.9 +7 -7 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractMetamataTask.java 2001/12/22 22:01:58 1.8
+++ AbstractMetamataTask.java 2001/12/23 06:20:34 1.9
@@ -200,8 +200,7 @@
try
{
setUp();
- ExecuteStreamHandler handler = createStreamHandler();
- execute0( handler );
+ execute0();
}
finally
{
@@ -304,7 +303,7 @@
*
* @return Description of the Returned Value
*/
- protected abstract ExecuteStreamHandler createStreamHandler();
+ protected abstract void setupStreamHandler( Execute exe );
/**
* execute the process with a specific handler
@@ -312,15 +311,16 @@
* @param handler Description of Parameter
* @exception TaskException Description of Exception
*/
- protected void execute0( ExecuteStreamHandler handler )
+ protected void execute0()
throws TaskException
{
- final Execute process = new Execute( handler );
+ final Execute exe = new Execute();
+ setupStreamHandler( exe );
log( cmdl.toString(), Project.MSG_VERBOSE );
- process.setCommandline( cmdl.getCommandline() );
+ exe.setCommandline( cmdl.getCommandline() );
try
{
- if( process.execute() != 0 )
+ if( exe.execute() != 0 )
{
throw new TaskException( "Metamata task failed." );
}
1.7 +10 -6 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
Index: MAudit.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MAudit.java 2001/12/21 14:21:22 1.6
+++ MAudit.java 2001/12/23 06:20:34 1.7
@@ -16,6 +16,8 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.Execute;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Path;
/**
@@ -186,7 +188,7 @@
options.add( "-unused" );
options.add( searchPath.toString() );
}
- addAllArrayList( options, includedFiles.keys() );
+ addAllArrayList( options, includedFiles.keySet().iterator() );
return options;
}
@@ -220,14 +222,14 @@
*/
}
- protected ExecuteStreamHandler createStreamHandler()
+ protected void setupStreamHandler( final Execute exe )
throws TaskException
{
- ExecuteStreamHandler handler = null;
// if we didn't specify a file, then use a screen report
if( outFile == null )
{
- handler = new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_INFO );
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
}
else
{
@@ -235,14 +237,16 @@
{
//XXX
OutputStream out = new FileOutputStream( outFile );
- handler = new MAuditStreamHandler( this, out );
+ //handler = new MAuditStreamHandler( this, out );
+ //FIXME: should behave like in Ant1.x
+ exe.setOutput( out );
+ exe.setError( out );
}
catch( IOException e )
{
throw new TaskException( "Error", e );
}
}
- return handler;
}
/**
1.6 +6 -5 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
Index: MMetrics.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MMetrics.java 2001/12/21 14:21:22 1.5
+++ MMetrics.java 2001/12/23 06:20:34 1.6
@@ -16,6 +16,8 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.types.Path;
/**
@@ -161,7 +163,7 @@
options.add( dirs[ i ] );
}
// files next.
- addAllArrayList( options, includedFiles.keys() );
+ addAllArrayList( options, includedFiles.keySet().iterator() );
return options;
}
@@ -223,11 +225,10 @@
*
* @return Description of the Returned Value
*/
- protected ExecuteStreamHandler createStreamHandler()
+ protected void setupStreamHandler( final Execute exe )
{
- // write the report directtly to an XML stream
- // return new MMetricsStreamHandler(this, xmlStream);
- return new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_INFO );
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_INFO ) );
}
protected void execute0( ExecuteStreamHandler handler )
1.3 +3 -3 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java
Index: SimpleP4OutputHandler.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleP4OutputHandler.java 2001/12/16 00:35:05 1.2
+++ SimpleP4OutputHandler.java 2001/12/23 06:20:34 1.3
@@ -10,10 +10,10 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
-public class SimpleP4OutputHandler extends P4HandlerAdapter
+public class SimpleP4OutputHandler
+ extends P4HandlerAdapter
{
-
- P4Base parent;
+ private P4Base parent;
public SimpleP4OutputHandler( P4Base parent )
{
1.9 +10 -8 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Pvcs.java 2001/12/22 12:57:39 1.8
+++ Pvcs.java 2001/12/23 06:20:35 1.9
@@ -15,6 +15,7 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.OutputStream;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
@@ -23,10 +24,7 @@
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
-import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
-import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
import org.apache.tools.ant.types.Commandline;
/**
@@ -367,7 +365,7 @@
tmp = new File( "pvcs_ant_" + rand.nextLong() + ".log" );
tmp2 = new File( "pvcs_ant_" + rand.nextLong() + ".log" );
log( "Executing " + commandLine.toString(), Project.MSG_VERBOSE );
- result = runCmd( commandLine, new PumpStreamHandler( new FileOutputStream( tmp ), new LogOutputStream( this, Project.MSG_WARN ) ) );
+ result = runCmd( commandLine, new FileOutputStream( tmp ), new LogOutputStream( this, Project.MSG_WARN ) );
if( result != 0 && !ignorerc )
{
String msg = "Failed executing: " + commandLine.toString();
@@ -409,7 +407,10 @@
commandLine.createArgument().setValue( "@" + tmp2.getAbsolutePath() );
log( "Getting files", Project.MSG_INFO );
log( "Executing " + commandLine.toString(), Project.MSG_VERBOSE );
- result = runCmd( commandLine, new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
+ final LogOutputStream output = new LogOutputStream( this, Project.MSG_INFO );
+ final LogOutputStream error = new LogOutputStream( this, Project.MSG_WARN );
+ result = runCmd( commandLine, output, error );
+
if( result != 0 && !ignorerc )
{
String msg = "Failed executing: " + commandLine.toString() + ". Return code was " + result;
@@ -445,13 +446,14 @@
}
}
- protected int runCmd( Commandline cmd, ExecuteStreamHandler out )
+ protected int runCmd( Commandline cmd, OutputStream output, OutputStream error )
throws TaskException
{
try
{
- Project aProj = getProject();
- Execute exe = new Execute( out );
+ final Execute exe = new Execute();
+ exe.setOutput( output );
+ exe.setError( error );
exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd.getCommandline() );
return exe.execute();
1.7 +6 -4 jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
Index: CovMerge.java
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CovMerge.java 2001/12/22 12:57:39 1.6
+++ CovMerge.java 2001/12/23 06:20:35 1.7
@@ -19,6 +19,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.FileSet;
@@ -115,14 +116,15 @@
}
cmdl.createArgument().setValue( "-jp_paramfile=" + paramfile.getAbsolutePath() );
- LogStreamHandler handler = new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN );
- Execute exec = new Execute( handler );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
log( cmdl.toString(), Project.MSG_VERBOSE );
- exec.setCommandline( cmdl.getCommandline() );
+ exe.setCommandline( cmdl.getCommandline() );
// JProbe process always return 0 so we will not be
// able to check for failure ! :-(
- int exitValue = exec.execute();
+ int exitValue = exe.execute();
if( exitValue != 0 )
{
throw new TaskException( "JProbe Coverage Merging failed (" + exitValue + ")" );
1.9 +6 -4 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CovReport.java 2001/12/21 14:21:23 1.8
+++ CovReport.java 2001/12/23 06:20:35 1.9
@@ -22,6 +22,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Path;
@@ -242,11 +243,12 @@
}
// use the custom handler for stdin issues
- LogStreamHandler handler = new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN );
- Execute exec = new Execute( handler );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
log( cmdl.toString(), Project.MSG_VERBOSE );
- exec.setCommandline( cmdl.getCommandline() );
- int exitValue = exec.execute();
+ exe.setCommandline( cmdl.getCommandline() );
+ int exitValue = exe.execute();
if( exitValue != 0 )
{
throw new TaskException( "JProbe Coverage Report failed (" + exitValue + ")" );
1.9 +0 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Coverage.java 2001/12/22 22:01:58 1.8
+++ Coverage.java 2001/12/23 06:20:35 1.9
@@ -539,8 +539,6 @@
/**
* specific pumper to avoid those nasty stdin issues
- *
- * @author RT
*/
static class CoverageStreamHandler extends LogStreamHandler
{
1.11 +4 -3 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MSVSS.java 2001/12/22 22:52:39 1.10
+++ MSVSS.java 2001/12/23 06:20:35 1.11
@@ -15,6 +15,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.exec.Execute;
import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -206,9 +207,9 @@
{
try
{
- Execute exe = new Execute( new LogStreamHandler( this,
- Project.MSG_INFO,
- Project.MSG_WARN ) );
+ final Execute exe = new Execute();
+ exe.setOutput( new LogOutputStream( this, Project.MSG_INFO ) );
+ exe.setError( new LogOutputStream( this, Project.MSG_WARN ) );
// If location of ss.ini is specified we need to set the
// environment-variable SSDIR to this value
1.2 +6 -5 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rpm.java 2001/12/22 23:38:37 1.1
+++ Rpm.java 2001/12/23 06:20:35 1.2
@@ -144,13 +144,13 @@
toExecute.createArgument().setValue( "SPECS/" + specFile );
- ExecuteStreamHandler streamhandler = null;
OutputStream outputstream = null;
OutputStream errorstream = null;
+
if( error == null && output == null )
{
- streamhandler = new LogStreamHandler( this, Project.MSG_INFO,
- Project.MSG_WARN );
+ outputstream = new LogOutputStream( this, Project.MSG_INFO );
+ errorstream = new LogOutputStream( this, Project.MSG_WARN );
}
else
{
@@ -184,10 +184,11 @@
{
errorstream = new LogOutputStream( this, Project.MSG_WARN );
}
- streamhandler = new PumpStreamHandler( outputstream, errorstream );
}
- Execute exe = new Execute( streamhandler );
+ Execute exe = new Execute();
+ exe.setOutput( outputstream );
+ exe.setError( errorstream );
if( topDir == null ) topDir = getBaseDirectory();
exe.setWorkingDirectory( topDir );
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>