donaldp 02/01/05 18:19:35
Modified:
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
Coverage.java
Removed:
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
CoverageStreamHandler.java
Log:
Use Execute2 abstraction
Revision Changes Path
1.15 +6 -10
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Coverage.java 30 Dec 2001 11:00:20 -0000 1.14
+++ Coverage.java 6 Jan 2002 02:19:34 -0000 1.15
@@ -15,9 +15,7 @@
import java.util.ArrayList;
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.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.Execute2;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -189,7 +187,7 @@
*/
public Path createClasspath()
{
- return cmdlJava.createClasspath( getProject() ).createPath();
+ return cmdlJava.createClasspath().createPath();
}
public Filters createFilters()
@@ -251,13 +249,11 @@
cmdl.createArgument().setValue( "-jp_input=" +
paramfile.getAbsolutePath() );
// use the custom handler for stdin issues
- final LogOutputStream output = new LogOutputStream( getLogger(),
false );
- final LogOutputStream error = new LogOutputStream( getLogger(),
true );
- final LogStreamHandler handler = new CoverageStreamHandler(
output, error );
- Execute exec = new Execute( handler );
+ final Execute2 exe = new Execute2();
+ setupLogger( exe );
getLogger().debug( cmdl.toString() );
- exec.setCommandline( cmdl.getCommandline() );
- int exitValue = exec.execute();
+ exe.setCommandline( cmdl.getCommandline() );
+ int exitValue = exe.execute();
if( exitValue != 0 )
{
throw new TaskException( "JProbe Coverage failed (" +
exitValue + ")" );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
