diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
index 1989fcc02..c59aba416 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
@@ -7,12 +7,10 @@
*/
package org.apache.tools.ant.taskdefs.compilers;
-import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -34,14 +32,13 @@ public class Javac12 extends DefaultCompilerAdapter
getLogger().debug( "Using classic compiler" );
Commandline cmd = setupJavacCommand( true );
- OutputStream logstr = new LogOutputStream( getLogger(), true );
try
{
// Create an instance of the compiler, redirecting output to
// the project log
Class c = Class.forName( "sun.tools.javac.Main" );
Constructor cons = c.getConstructor( new Class[]{OutputStream.class, String.class} );
- Object compiler = cons.newInstance( new Object[]{logstr, "javac"} );
+ Object compiler = cons.newInstance( new Object[]{System.out, "javac"} );
// Call the compile() method
Method compile = c.getMethod( "compile", new Class[]{String[].class} );
@@ -65,17 +62,5 @@ public class Javac12 extends DefaultCompilerAdapter
throw new TaskException( "Error starting classic compiler: ", ex );
}
}
- finally
- {
- try
- {
- logstr.close();
- }
- catch( IOException e )
- {
- // plain impossible
- throw new TaskException( "Error", e );
- }
- }
}
}
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 0b43e11a4..69d60b730 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -10,7 +10,6 @@ package org.apache.tools.ant.taskdefs.optional.junit;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -20,11 +19,10 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Random;
import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -399,16 +397,6 @@ public class JUnitTask extends Task
}
}
- /**
- * Get the default output for a formatter.
- *
- * @return The DefaultOutput value
- */
- protected OutputStream getDefaultOutput()
- {
- return new LogOutputStream( getLogger(), false );
- }
-
/**
* Merge all individual tests from the batchtest with all individual tests
* and return an enumeration over all JUnitTest .
@@ -713,7 +701,7 @@ public class JUnitTask extends Task
SummaryJUnitResultFormatter f =
new SummaryJUnitResultFormatter();
f.setWithOutAndErr( "withoutanderr".equalsIgnoreCase( summaryValue ) );
- f.setOutput( getDefaultOutput() );
+ f.setOutput( System.out );
runner.addFormatter( f );
}
@@ -728,7 +716,7 @@ public class JUnitTask extends Task
}
else
{
- fe.setOutput( getDefaultOutput() );
+ fe.setOutput( System.out );
}
runner.addFormatter( fe.createFormatter() );
}
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
index ada898dac..b671185be 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
@@ -12,7 +12,6 @@ import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -31,13 +30,12 @@ public class SunRmic extends DefaultRmicAdapter
// Create an instance of the rmic, redirecting output to
// the project log
- final LogOutputStream logstr = new LogOutputStream( getLogger(), true );
try
{
Class c = Class.forName( "sun.rmi.rmic.Main" );
Constructor cons = c.getConstructor( new Class[]
{OutputStream.class, String.class} );
- Object rmic = cons.newInstance( new Object[]{logstr, "rmic"} );
+ Object rmic = cons.newInstance( new Object[]{System.out, "rmic"} );
Method doRmic = c.getMethod( "compile",
new Class[]{String[].class} );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java
index 1989fcc02..c59aba416 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java
@@ -7,12 +7,10 @@
*/
package org.apache.tools.ant.taskdefs.compilers;
-import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -34,14 +32,13 @@ public class Javac12 extends DefaultCompilerAdapter
getLogger().debug( "Using classic compiler" );
Commandline cmd = setupJavacCommand( true );
- OutputStream logstr = new LogOutputStream( getLogger(), true );
try
{
// Create an instance of the compiler, redirecting output to
// the project log
Class c = Class.forName( "sun.tools.javac.Main" );
Constructor cons = c.getConstructor( new Class[]{OutputStream.class, String.class} );
- Object compiler = cons.newInstance( new Object[]{logstr, "javac"} );
+ Object compiler = cons.newInstance( new Object[]{System.out, "javac"} );
// Call the compile() method
Method compile = c.getMethod( "compile", new Class[]{String[].class} );
@@ -65,17 +62,5 @@ public class Javac12 extends DefaultCompilerAdapter
throw new TaskException( "Error starting classic compiler: ", ex );
}
}
- finally
- {
- try
- {
- logstr.close();
- }
- catch( IOException e )
- {
- // plain impossible
- throw new TaskException( "Error", e );
- }
- }
}
}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 0b43e11a4..69d60b730 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -10,7 +10,6 @@ package org.apache.tools.ant.taskdefs.optional.junit;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -20,11 +19,10 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Random;
import org.apache.aut.nativelib.ExecManager;
-import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.tools.ant.Task;
+import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.Execute;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
+import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Argument;
import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.CommandlineJava;
@@ -399,16 +397,6 @@ public class JUnitTask extends Task
}
}
- /**
- * Get the default output for a formatter.
- *
- * @return The DefaultOutput value
- */
- protected OutputStream getDefaultOutput()
- {
- return new LogOutputStream( getLogger(), false );
- }
-
/**
* Merge all individual tests from the batchtest with all individual tests
* and return an enumeration over all JUnitTest .
@@ -713,7 +701,7 @@ public class JUnitTask extends Task
SummaryJUnitResultFormatter f =
new SummaryJUnitResultFormatter();
f.setWithOutAndErr( "withoutanderr".equalsIgnoreCase( summaryValue ) );
- f.setOutput( getDefaultOutput() );
+ f.setOutput( System.out );
runner.addFormatter( f );
}
@@ -728,7 +716,7 @@ public class JUnitTask extends Task
}
else
{
- fe.setOutput( getDefaultOutput() );
+ fe.setOutput( System.out );
}
runner.addFormatter( fe.createFormatter() );
}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
index ada898dac..b671185be 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java
@@ -12,7 +12,6 @@ import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
import org.apache.tools.ant.types.Commandline;
/**
@@ -31,13 +30,12 @@ public class SunRmic extends DefaultRmicAdapter
// Create an instance of the rmic, redirecting output to
// the project log
- final LogOutputStream logstr = new LogOutputStream( getLogger(), true );
try
{
Class c = Class.forName( "sun.rmi.rmic.Main" );
Constructor cons = c.getConstructor( new Class[]
{OutputStream.class, String.class} );
- Object rmic = cons.newInstance( new Object[]{logstr, "rmic"} );
+ Object rmic = cons.newInstance( new Object[]{System.out, "rmic"} );
Method doRmic = c.getMethod( "compile",
new Class[]{String[].class} );