You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/07/06 15:45:53 UTC
svn commit: r209460 - in
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum:
execution/AbstractBuildExecutor.java
utils/shell/DefaultShellCommandHelper.java
Author: trygvis
Date: Wed Jul 6 06:45:51 2005
New Revision: 209460
URL: http://svn.apache.org/viewcvs?rev=209460&view=rev
Log:
o Centralizing shell command execution logging.
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=209460&r1=209459&r2=209460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Wed Jul 6 06:45:51 2005
@@ -156,8 +156,6 @@
}
else
{
- getLogger().warn( "Using executable '" + e.getAbsolutePath() + "'." );
-
actualExecutable = e.getAbsolutePath();
}
}
@@ -166,11 +164,19 @@
// Execute the build
// ----------------------------------------------------------------------
+ getLogger().warn( "Executable '" + actualExecutable + "'." );
+
+ getLogger().info( "Arguments: " + arguments );
+
+ getLogger().info( "Working directory: " + workingDirectory.getAbsolutePath() );
+
try
{
ExecutionResult result = shellCommandHelper.executeShellCommand( workingDirectory,
actualExecutable,
arguments );
+
+ getLogger().info( "Exit code: " + result.getExitCode() );
return new ContinuumBuildExecutionResult( result.getExitCode() == 0,
result.getStandardOutput(),
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java?rev=209460&r1=209459&r2=209460&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/shell/DefaultShellCommandHelper.java Wed Jul 6 06:45:51 2005
@@ -80,10 +80,6 @@
CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
- getLogger().info( "Executing: " + cl );
-
- getLogger().info( "Working directory: " + workingDirectory.getAbsolutePath() );
-
int exitCode = CommandLineUtils.executeCommandLine( cl, stdout, stderr );
// ----------------------------------------------------------------------