[MSHARED-638] use script description instead of hardcoded "script" in messages

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1797598 13f79535-47bb-0310-9956-ffa450edef68

Author: hboutemy

maven-script-interpreter/src/main/java/org/apache/maven/shared/scriptinterpreter/ScriptRunner.java

@@ -138,12 +138,12 @@ public void setScriptEncoding( String encoding )
     }
 
     /**
-     * Runs the specified hook script.
+     * Runs the specified hook script (after resolution).
      *
      * @param scriptDescription The description of the script to use for logging, must not be <code>null</code>.
      * @param basedir The base directory of the project, must not be <code>null</code>.
      * @param relativeScriptPath The path to the script relative to the project base directory, may be <code>null</code>
-     *            to skip the script execution.
+     *            to skip the script execution and may not have extensions (resolution will search).
      * @param context The key-value storage used to share information between hook scripts, may be <code>null</code>.
      * @param logger The logger to redirect the script output to, may be <code>null</code> to use stdout/stderr.
      * @param stage The stage of the build job the script is invoked in, must not be <code>null</code>. This is for
@@ -161,20 +161,21 @@ public void run( final String scriptDescription, final File basedir, final Strin
     {
         if ( relativeScriptPath == null )
         {
-            getLog().debug( "relativeScriptPath is null: not executing script" );
+            getLog().debug( scriptDescription + ": relativeScriptPath is null, not executing script" );
             return;
         }
 
         final File scriptFile = resolveScript( new File( basedir, relativeScriptPath ) );
 
         if ( !scriptFile.exists() )
         {
-            getLog().debug( "no script found in directory: " + basedir.getAbsolutePath() );
+            getLog().debug( scriptDescription + ": no script '" + relativeScriptPath + "' found in directory "
+                + basedir.getAbsolutePath() );
             return;
         }
 
-        String path = scriptFile.getAbsolutePath();
-        getLog().info( "run script " + relativeScriptPath + path.substring( path.lastIndexOf( '.' ) ) );
+        getLog().info( "run " + scriptDescription + ' ' + relativeScriptPath + '.'
+            + FileUtils.extension( scriptFile.getAbsolutePath() ) );
 
         executeRun( scriptDescription, scriptFile, context, logger, stage, failOnException );
     }
@@ -201,11 +202,12 @@ public void run( final String scriptDescription, File scriptFile, final Map<Stri
 
         if ( !scriptFile.exists() )
         {
-            getLog().debug( "scriptFile not found in directory: " + scriptFile.getAbsolutePath() );
+            getLog().debug( scriptDescription + ": script file not found in directory "
+                + scriptFile.getAbsolutePath() );
             return;
         }
 
-        getLog().info( "run script " + scriptFile.getAbsolutePath() );
+        getLog().info( "run " + scriptDescription + ' ' + scriptFile.getAbsolutePath() );
 
         executeRun( scriptDescription, scriptFile, context, logger, stage, failOnException );
     }