diff --git a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java index 167d5173a..bba48d6f7 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java @@ -150,7 +150,6 @@ public class Cvs final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( m_dest == null ) { m_dest = getBaseDirectory(); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java index d14681e44..361522705 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java @@ -174,7 +174,6 @@ public class Exec final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setTimeout( m_timeout ); exe.setWorkingDirectory( m_dir ); exe.setNewenvironment( m_newEnvironment ); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java index 89d4b5762..44ed0e322 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java @@ -297,7 +297,6 @@ public class SignJar final Commandline cmd = buildCommand( jarTarget, jarSource ); final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setCommandline( cmd ); try { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java index c15e9bfe2..cc14dd66a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -220,7 +220,6 @@ public class Java { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( m_dir == null ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 182094591..943bf0406 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -363,7 +363,6 @@ public abstract class DefaultCompilerAdapter { 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; exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index cbc329cc7..861624a4b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -816,7 +816,6 @@ public class Javadoc final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setExecOutputHandler( this ); /* diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 33144dd01..8c62fc091 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -229,8 +229,6 @@ public class ANTLR extends Task { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); - if( workingdir != null ) { exe.setWorkingDirectory( workingdir ); @@ -257,7 +255,6 @@ public class ANTLR extends Task // if no output directory is specified, used the target's directory if( outputDirectory == null ) { - String fileName = target.toString(); setOutputdirectory( new File( target.getParent() ) ); } if( !outputDirectory.isDirectory() ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index 8cb2aa241..671c24ae1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -137,7 +137,6 @@ public class Cab File listFile = createListFile( files ); final ExecManager execManager = (ExecManager)getService( ExecManager.class ); Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( m_baseDir ); final Commandline cmd = createCommand( listFile ); exe.setCommandline( cmd ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 81539cec0..1155c4cf1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -114,7 +114,6 @@ public abstract class Continuus { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( null != handler ) { exe.setExecOutputHandler( handler ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index 917df8aca..577c19f3d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -110,7 +110,6 @@ public abstract class ClearCase extends Task { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd ); return exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index e3376e2d1..320b07994 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -202,7 +202,6 @@ public class NetCommand File dir = _owner.getBaseDirectory(); final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class ); _exe = new Execute2( execManager ); - setupLogger( _exe ); _exe.setWorkingDirectory( dir ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 2c7ae2c6e..e6d275a6e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -163,7 +163,6 @@ public class BorlandGenerateClient extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( new File( "." ) ); exe.setCommandline( cmd ); exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 4dbf860f7..ef3362e05 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -183,8 +183,6 @@ public class JJTree extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); - getLogger().debug( cmdl.toString() ); exe.setCommandline( new Commandline( cmdl.getCommandline() ) ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 9ced6b784..513edc45e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -244,7 +244,6 @@ public class JavaCC extends Task getLogger().debug( cmdline.toString() ); 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 ) ); int retval = exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 3479fa374..bf3578dc1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -242,7 +242,6 @@ public class JDependTask final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); final String[] commandline1 = commandline.getCommandline(); exe.setCommandline( new Commandline( commandline1 ) ); 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 547193dad..a8187a921 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 @@ -651,7 +651,6 @@ public class JUnitTask extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setCommandline( new Commandline( cmd.getCommandline() ) ); if( dir != null ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index a8d062828..30e9e4563 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -281,7 +281,6 @@ public abstract class AbstractMetamataTask { 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(); exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index 337fd59bd..32ee3568e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -289,7 +289,6 @@ public class MParse 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(); exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 107973098..ce82bc007 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -193,7 +193,6 @@ public class Pvcs { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd ); result = exe.execute(); @@ -275,7 +274,6 @@ public class Pvcs final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setExecOutputHandler( this ); m_output = new FileOutputStream( tmp ); exe.setWorkingDirectory( getBaseDirectory() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index b0010a348..ecf0c3a26 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -117,7 +117,6 @@ public class CovMerge extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index 9f3e9cbea..7028bce95 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -249,7 +249,6 @@ public class CovReport extends Task // use the custom handler for stdin issues final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); int exitValue = exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 8413dc671..6b1123e8c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -199,8 +199,6 @@ public class Coverage /** * the jvm arguments - * - * @return Description of the Returned Value */ public void addJvmarg( final Argument argument ) { @@ -253,7 +251,6 @@ public class Coverage // use the custom handler for stdin issues final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); int exitValue = exe.execute(); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index b4125ce00..7c1db5b82 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -207,7 +207,6 @@ public abstract class MSVSS extends Task { 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 // environment-variable SSDIR to this value diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java index 76fa4b979..3309f5dae 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java @@ -92,7 +92,6 @@ public class Rpm final Commandline cmd = createCommand(); final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( m_topDir == null ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java index c15e9bfe2..cc14dd66a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java @@ -220,7 +220,6 @@ public class Java { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( m_dir == null ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 182094591..943bf0406 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -363,7 +363,6 @@ public abstract class DefaultCompilerAdapter { 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; exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index cbc329cc7..861624a4b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -816,7 +816,6 @@ public class Javadoc final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setExecOutputHandler( this ); /* diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 33144dd01..8c62fc091 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -229,8 +229,6 @@ public class ANTLR extends Task { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); - if( workingdir != null ) { exe.setWorkingDirectory( workingdir ); @@ -257,7 +255,6 @@ public class ANTLR extends Task // if no output directory is specified, used the target's directory if( outputDirectory == null ) { - String fileName = target.toString(); setOutputdirectory( new File( target.getParent() ) ); } if( !outputDirectory.isDirectory() ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java index 8cb2aa241..671c24ae1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -137,7 +137,6 @@ public class Cab File listFile = createListFile( files ); final ExecManager execManager = (ExecManager)getService( ExecManager.class ); Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( m_baseDir ); final Commandline cmd = createCommand( listFile ); exe.setCommandline( cmd ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index 81539cec0..1155c4cf1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -114,7 +114,6 @@ public abstract class Continuus { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( null != handler ) { exe.setExecOutputHandler( handler ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java index 917df8aca..577c19f3d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java @@ -110,7 +110,6 @@ public abstract class ClearCase extends Task { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd ); return exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index e3376e2d1..320b07994 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -202,7 +202,6 @@ public class NetCommand File dir = _owner.getBaseDirectory(); final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class ); _exe = new Execute2( execManager ); - setupLogger( _exe ); _exe.setWorkingDirectory( dir ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java index 2c7ae2c6e..e6d275a6e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java @@ -163,7 +163,6 @@ public class BorlandGenerateClient extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( new File( "." ) ); exe.setCommandline( cmd ); exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 4dbf860f7..ef3362e05 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -183,8 +183,6 @@ public class JJTree extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); - getLogger().debug( cmdl.toString() ); exe.setCommandline( new Commandline( cmdl.getCommandline() ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index 9ced6b784..513edc45e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -244,7 +244,6 @@ public class JavaCC extends Task getLogger().debug( cmdline.toString() ); 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 ) ); int retval = exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 3479fa374..bf3578dc1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -242,7 +242,6 @@ public class JDependTask final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); final String[] commandline1 = commandline.getCommandline(); exe.setCommandline( new Commandline( commandline1 ) ); 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 547193dad..a8187a921 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 @@ -651,7 +651,6 @@ public class JUnitTask extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setCommandline( new Commandline( cmd.getCommandline() ) ); if( dir != null ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index a8d062828..30e9e4563 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -281,7 +281,6 @@ public abstract class AbstractMetamataTask { 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(); exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index 337fd59bd..32ee3568e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -289,7 +289,6 @@ public class MParse 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(); exe.setCommandline( new Commandline( commandline ) ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index 107973098..ce82bc007 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -193,7 +193,6 @@ public class Pvcs { final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setWorkingDirectory( getBaseDirectory() ); exe.setCommandline( cmd ); result = exe.execute(); @@ -275,7 +274,6 @@ public class Pvcs final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); exe.setExecOutputHandler( this ); m_output = new FileOutputStream( tmp ); exe.setWorkingDirectory( getBaseDirectory() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index b0010a348..ecf0c3a26 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -117,7 +117,6 @@ public class CovMerge extends Task final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index 9f3e9cbea..7028bce95 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -249,7 +249,6 @@ public class CovReport extends Task // use the custom handler for stdin issues final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); int exitValue = exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 8413dc671..6b1123e8c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -199,8 +199,6 @@ public class Coverage /** * the jvm arguments - * - * @return Description of the Returned Value */ public void addJvmarg( final Argument argument ) { @@ -253,7 +251,6 @@ public class Coverage // use the custom handler for stdin issues final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); getLogger().debug( cmdl.toString() ); exe.setCommandline( cmdl ); int exitValue = exe.execute(); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index b4125ce00..7c1db5b82 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -207,7 +207,6 @@ public abstract class MSVSS extends Task { 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 // environment-variable SSDIR to this value diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java index 76fa4b979..3309f5dae 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java @@ -92,7 +92,6 @@ public class Rpm final Commandline cmd = createCommand(); final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final Execute2 exe = new Execute2( execManager ); - setupLogger( exe ); if( m_topDir == null ) {