Browse Source

No need to setup a Logger for Execute.

All logging will be routed via System.err or System.out as appropriate


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271261 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
e0f1ffa9ba
45 changed files with 0 additions and 57 deletions
  1. +0
    -1
      proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
  2. +0
    -1
      proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
  3. +0
    -1
      proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
  4. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
  5. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  6. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  7. +0
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  8. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  9. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  10. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  11. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  12. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
  13. +0
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  14. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  15. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  16. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  17. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  18. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  19. +0
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  20. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  21. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  22. +0
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  23. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  24. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java
  25. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
  26. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  27. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  28. +0
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  29. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
  30. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  31. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  32. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  33. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
  34. +0
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  35. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  36. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  37. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  38. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  39. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  40. +0
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  41. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  42. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  43. +0
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  44. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  45. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java

+ 0
- 1
proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java View File

@@ -150,7 +150,6 @@ public class Cvs


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( m_dest == null ) if( m_dest == null )
{ {
m_dest = getBaseDirectory(); m_dest = getBaseDirectory();


+ 0
- 1
proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java View File

@@ -174,7 +174,6 @@ public class Exec


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setTimeout( m_timeout ); exe.setTimeout( m_timeout );
exe.setWorkingDirectory( m_dir ); exe.setWorkingDirectory( m_dir );
exe.setNewenvironment( m_newEnvironment ); exe.setNewenvironment( m_newEnvironment );


+ 0
- 1
proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java View File

@@ -297,7 +297,6 @@ public class SignJar
final Commandline cmd = buildCommand( jarTarget, jarSource ); final Commandline cmd = buildCommand( jarTarget, jarSource );
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
try try
{ {


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java View File

@@ -220,7 +220,6 @@ public class Java
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


if( m_dir == null ) if( m_dir == null )
{ {


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -363,7 +363,6 @@ public abstract class DefaultCompilerAdapter
{ {
final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class ); final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir ); exe.setWorkingDirectory( m_baseDir );
final String[] commandline = commandArray; final String[] commandline = commandArray;
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -816,7 +816,6 @@ public class Javadoc


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this ); exe.setExecOutputHandler( this );


/* /*


+ 0
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java View File

@@ -229,8 +229,6 @@ public class ANTLR extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );

if( workingdir != null ) if( workingdir != null )
{ {
exe.setWorkingDirectory( workingdir ); exe.setWorkingDirectory( workingdir );
@@ -257,7 +255,6 @@ public class ANTLR extends Task
// if no output directory is specified, used the target's directory // if no output directory is specified, used the target's directory
if( outputDirectory == null ) if( outputDirectory == null )
{ {
String fileName = target.toString();
setOutputdirectory( new File( target.getParent() ) ); setOutputdirectory( new File( target.getParent() ) );
} }
if( !outputDirectory.isDirectory() ) if( !outputDirectory.isDirectory() )


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java View File

@@ -137,7 +137,6 @@ public class Cab
File listFile = createListFile( files ); File listFile = createListFile( files );
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
Execute2 exe = new Execute2( execManager ); Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir ); exe.setWorkingDirectory( m_baseDir );
final Commandline cmd = createCommand( listFile ); final Commandline cmd = createCommand( listFile );
exe.setCommandline( cmd ); exe.setCommandline( cmd );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java View File

@@ -114,7 +114,6 @@ public abstract class Continuus
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( null != handler ) if( null != handler )
{ {
exe.setExecOutputHandler( handler ); exe.setExecOutputHandler( handler );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java View File

@@ -110,7 +110,6 @@ public abstract class ClearCase extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
return exe.execute(); return exe.execute();


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java View File

@@ -202,7 +202,6 @@ public class NetCommand
File dir = _owner.getBaseDirectory(); File dir = _owner.getBaseDirectory();
final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class ); final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class );
_exe = new Execute2( execManager ); _exe = new Execute2( execManager );
setupLogger( _exe );
_exe.setWorkingDirectory( dir ); _exe.setWorkingDirectory( dir );
} }
} }

+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java View File

@@ -163,7 +163,6 @@ public class BorlandGenerateClient extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( new File( "." ) ); exe.setWorkingDirectory( new File( "." ) );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
exe.execute(); exe.execute();


+ 0
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java View File

@@ -183,8 +183,6 @@ public class JJTree extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );

getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( new Commandline( cmdl.getCommandline() ) ); exe.setCommandline( new Commandline( cmdl.getCommandline() ) );




+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java View File

@@ -244,7 +244,6 @@ public class JavaCC extends Task
getLogger().debug( cmdline.toString() ); getLogger().debug( cmdline.toString() );
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
final String[] commandline = cmdline.getCommandline(); final String[] commandline = cmdline.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );
int retval = exe.execute(); int retval = exe.execute();


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java View File

@@ -242,7 +242,6 @@ public class JDependTask


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


final String[] commandline1 = commandline.getCommandline(); final String[] commandline1 = commandline.getCommandline();
exe.setCommandline( new Commandline( commandline1 ) ); exe.setCommandline( new Commandline( commandline1 ) );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -651,7 +651,6 @@ public class JUnitTask extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setCommandline( new Commandline( cmd.getCommandline() ) ); exe.setCommandline( new Commandline( cmd.getCommandline() ) );
if( dir != null ) if( dir != null )
{ {


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java View File

@@ -281,7 +281,6 @@ public abstract class AbstractMetamataTask
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() ); getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline(); final String[] commandline = m_cmdl.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java View File

@@ -289,7 +289,6 @@ public class MParse


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() ); getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline(); final String[] commandline = m_cmdl.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java View File

@@ -193,7 +193,6 @@ public class Pvcs
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
result = exe.execute(); result = exe.execute();
@@ -275,7 +274,6 @@ public class Pvcs


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this ); exe.setExecOutputHandler( this );
m_output = new FileOutputStream( tmp ); m_output = new FileOutputStream( tmp );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

@@ -117,7 +117,6 @@ public class CovMerge extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );




+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java View File

@@ -249,7 +249,6 @@ public class CovReport extends Task
// use the custom handler for stdin issues // use the custom handler for stdin issues
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );
int exitValue = exe.execute(); int exitValue = exe.execute();


+ 0
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java View File

@@ -199,8 +199,6 @@ public class Coverage


/** /**
* the jvm arguments * the jvm arguments
*
* @return Description of the Returned Value
*/ */
public void addJvmarg( final Argument argument ) public void addJvmarg( final Argument argument )
{ {
@@ -253,7 +251,6 @@ public class Coverage
// use the custom handler for stdin issues // use the custom handler for stdin issues
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );
int exitValue = exe.execute(); int exitValue = exe.execute();


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java View File

@@ -207,7 +207,6 @@ public abstract class MSVSS extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


// If location of ss.ini is specified we need to set the // If location of ss.ini is specified we need to set the
// environment-variable SSDIR to this value // environment-variable SSDIR to this value


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java View File

@@ -92,7 +92,6 @@ public class Rpm
final Commandline cmd = createCommand(); final Commandline cmd = createCommand();
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


if( m_topDir == null ) if( m_topDir == null )
{ {


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java View File

@@ -220,7 +220,6 @@ public class Java
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


if( m_dir == null ) if( m_dir == null )
{ {


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -363,7 +363,6 @@ public abstract class DefaultCompilerAdapter
{ {
final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class ); final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir ); exe.setWorkingDirectory( m_baseDir );
final String[] commandline = commandArray; final String[] commandline = commandArray;
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -816,7 +816,6 @@ public class Javadoc


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this ); exe.setExecOutputHandler( this );


/* /*


+ 0
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java View File

@@ -229,8 +229,6 @@ public class ANTLR extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );

if( workingdir != null ) if( workingdir != null )
{ {
exe.setWorkingDirectory( workingdir ); exe.setWorkingDirectory( workingdir );
@@ -257,7 +255,6 @@ public class ANTLR extends Task
// if no output directory is specified, used the target's directory // if no output directory is specified, used the target's directory
if( outputDirectory == null ) if( outputDirectory == null )
{ {
String fileName = target.toString();
setOutputdirectory( new File( target.getParent() ) ); setOutputdirectory( new File( target.getParent() ) );
} }
if( !outputDirectory.isDirectory() ) if( !outputDirectory.isDirectory() )


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java View File

@@ -137,7 +137,6 @@ public class Cab
File listFile = createListFile( files ); File listFile = createListFile( files );
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
Execute2 exe = new Execute2( execManager ); Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( m_baseDir ); exe.setWorkingDirectory( m_baseDir );
final Commandline cmd = createCommand( listFile ); final Commandline cmd = createCommand( listFile );
exe.setCommandline( cmd ); exe.setCommandline( cmd );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java View File

@@ -114,7 +114,6 @@ public abstract class Continuus
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
if( null != handler ) if( null != handler )
{ {
exe.setExecOutputHandler( handler ); exe.setExecOutputHandler( handler );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java View File

@@ -110,7 +110,6 @@ public abstract class ClearCase extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
return exe.execute(); return exe.execute();


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java View File

@@ -202,7 +202,6 @@ public class NetCommand
File dir = _owner.getBaseDirectory(); File dir = _owner.getBaseDirectory();
final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class ); final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class );
_exe = new Execute2( execManager ); _exe = new Execute2( execManager );
setupLogger( _exe );
_exe.setWorkingDirectory( dir ); _exe.setWorkingDirectory( dir );
} }
} }

+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java View File

@@ -163,7 +163,6 @@ public class BorlandGenerateClient extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( new File( "." ) ); exe.setWorkingDirectory( new File( "." ) );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
exe.execute(); exe.execute();


+ 0
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java View File

@@ -183,8 +183,6 @@ public class JJTree extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );

getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( new Commandline( cmdl.getCommandline() ) ); exe.setCommandline( new Commandline( cmdl.getCommandline() ) );




+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java View File

@@ -244,7 +244,6 @@ public class JavaCC extends Task
getLogger().debug( cmdline.toString() ); getLogger().debug( cmdline.toString() );
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
final String[] commandline = cmdline.getCommandline(); final String[] commandline = cmdline.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );
int retval = exe.execute(); int retval = exe.execute();


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java View File

@@ -242,7 +242,6 @@ public class JDependTask


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


final String[] commandline1 = commandline.getCommandline(); final String[] commandline1 = commandline.getCommandline();
exe.setCommandline( new Commandline( commandline1 ) ); exe.setCommandline( new Commandline( commandline1 ) );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -651,7 +651,6 @@ public class JUnitTask extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setCommandline( new Commandline( cmd.getCommandline() ) ); exe.setCommandline( new Commandline( cmd.getCommandline() ) );
if( dir != null ) if( dir != null )
{ {


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java View File

@@ -281,7 +281,6 @@ public abstract class AbstractMetamataTask
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() ); getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline(); final String[] commandline = m_cmdl.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java View File

@@ -289,7 +289,6 @@ public class MParse


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( m_cmdl.toString() ); getLogger().debug( m_cmdl.toString() );
final String[] commandline = m_cmdl.getCommandline(); final String[] commandline = m_cmdl.getCommandline();
exe.setCommandline( new Commandline( commandline ) ); exe.setCommandline( new Commandline( commandline ) );


+ 0
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java View File

@@ -193,7 +193,6 @@ public class Pvcs
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );
exe.setCommandline( cmd ); exe.setCommandline( cmd );
result = exe.execute(); result = exe.execute();
@@ -275,7 +274,6 @@ public class Pvcs


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
exe.setExecOutputHandler( this ); exe.setExecOutputHandler( this );
m_output = new FileOutputStream( tmp ); m_output = new FileOutputStream( tmp );
exe.setWorkingDirectory( getBaseDirectory() ); exe.setWorkingDirectory( getBaseDirectory() );


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

@@ -117,7 +117,6 @@ public class CovMerge extends Task


final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );




+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java View File

@@ -249,7 +249,6 @@ public class CovReport extends Task
// use the custom handler for stdin issues // use the custom handler for stdin issues
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );
int exitValue = exe.execute(); int exitValue = exe.execute();


+ 0
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java View File

@@ -199,8 +199,6 @@ public class Coverage


/** /**
* the jvm arguments * the jvm arguments
*
* @return Description of the Returned Value
*/ */
public void addJvmarg( final Argument argument ) public void addJvmarg( final Argument argument )
{ {
@@ -253,7 +251,6 @@ public class Coverage
// use the custom handler for stdin issues // use the custom handler for stdin issues
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );
getLogger().debug( cmdl.toString() ); getLogger().debug( cmdl.toString() );
exe.setCommandline( cmdl ); exe.setCommandline( cmdl );
int exitValue = exe.execute(); int exitValue = exe.execute();


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java View File

@@ -207,7 +207,6 @@ public abstract class MSVSS extends Task
{ {
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


// If location of ss.ini is specified we need to set the // If location of ss.ini is specified we need to set the
// environment-variable SSDIR to this value // environment-variable SSDIR to this value


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Rpm.java View File

@@ -92,7 +92,6 @@ public class Rpm
final Commandline cmd = createCommand(); final Commandline cmd = createCommand();
final ExecManager execManager = (ExecManager)getService( ExecManager.class ); final ExecManager execManager = (ExecManager)getService( ExecManager.class );
final Execute2 exe = new Execute2( execManager ); final Execute2 exe = new Execute2( execManager );
setupLogger( exe );


if( m_topDir == null ) if( m_topDir == null )
{ {


Loading…
Cancel
Save