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-ffa450edef68master
@@ -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(); | ||||
@@ -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 ); | ||||
@@ -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 | ||||
{ | { | ||||
@@ -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 ) | ||||
{ | { | ||||
@@ -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 ) ); | ||||
@@ -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 ); | ||||
/* | /* | ||||
@@ -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() ) | ||||
@@ -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 ); | ||||
@@ -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 ); | ||||
@@ -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(); | ||||
@@ -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 ); | ||||
} | } | ||||
} | } |
@@ -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(); | ||||
@@ -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() ) ); | ||||
@@ -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(); | ||||
@@ -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 ) ); | ||||
@@ -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 ) | ||||
{ | { | ||||
@@ -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 ) ); | ||||
@@ -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 ) ); | ||||
@@ -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() ); | ||||
@@ -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 ); | ||||
@@ -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(); | ||||
@@ -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(); | ||||
@@ -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 | ||||
@@ -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 ) | ||||
{ | { | ||||
@@ -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 ) | ||||
{ | { | ||||
@@ -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 ) ); | ||||
@@ -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 ); | ||||
/* | /* | ||||
@@ -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() ) | ||||
@@ -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 ); | ||||
@@ -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 ); | ||||
@@ -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(); | ||||
@@ -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 ); | ||||
} | } | ||||
} | } |
@@ -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(); | ||||
@@ -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() ) ); | ||||
@@ -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(); | ||||
@@ -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 ) ); | ||||
@@ -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 ) | ||||
{ | { | ||||
@@ -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 ) ); | ||||
@@ -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 ) ); | ||||
@@ -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() ); | ||||
@@ -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 ); | ||||
@@ -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(); | ||||
@@ -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(); | ||||
@@ -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 | ||||
@@ -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 ) | ||||
{ | { | ||||