Author: hboutemy
Date: Sun Jul 15 22:21:49 2012
New Revision: 1361825
URL: http://svn.apache.org/viewvc?rev=1361825&view=rev
Log:
[MSHARED-229] logged relative script path when available instead of full path
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Modified:
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java?rev=1361825&r1=1361824&r2=1361825&view=diff
==============================================================================
---
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
(original)
+++
maven/shared/trunk/maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java
Sun Jul 15 22:21:49 2012
@@ -171,8 +171,10 @@ public class ScriptRunner
return;
}
- run( scriptDescription, scriptFile, context, logger, stage,
failOnException );
+ String path = scriptFile.getAbsolutePath();
+ getLog().info( "run script " + relativeScriptPath + path.substring(
path.lastIndexOf( '.' ) ) );
+ executeRun( scriptDescription, scriptFile, context, logger, stage,
failOnException );
}
/**
@@ -201,6 +203,14 @@ public class ScriptRunner
getLog().info( "run script " + scriptFile.getAbsolutePath() );
+ executeRun( scriptDescription, scriptFile, context, logger, stage,
failOnException );
+ }
+
+ private void executeRun( final String scriptDescription, File scriptFile,
+ final Map<String, ? extends Object> context,
final ExecutionLogger logger, String stage,
+ boolean failOnException )
+ throws IOException, RunFailureException
+ {
Map<String, Object> globalVariables = new HashMap<String, Object>(
this.globalVariables );
globalVariables.put( "basedir", scriptFile.getParentFile() );
globalVariables.put( "context", context );