svn commit: r1194938 - in /maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker: AbstractInvokerMojo.java BuildErrorException.java BuildFailureException.java FileLogger.java ScriptRunner.java

[ol...@apache.org]

Author: olamy
Date: Sat Oct 29 17:22:16 2011
New Revision: 1194938

URL: http://svn.apache.org/viewvc?rev=1194938&view=rev
Log:
[MINVOKER-120] Move various script interpreters to a new artifact in maven-shared
extract ScriptRunner too

Removed:
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/BuildErrorException.java
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/BuildFailureException.java
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/ScriptRunner.java
Modified:
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
    maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java

Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1194938&r1=1194937&r2=1194938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Sat Oct 29 17:22:16 2011
@@ -36,6 +36,9 @@ import org.apache.maven.shared.invoker.M
 import org.apache.maven.shared.invoker.Invoker;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.scriptinterpreter.BuildErrorException;
+import org.apache.maven.shared.scriptinterpreter.BuildFailureException;
+import org.apache.maven.shared.scriptinterpreter.ScriptRunner;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.FileUtils;
@@ -1152,7 +1155,7 @@ public abstract class AbstractInvokerMoj
                 }
             }
         }
-        catch ( BuildErrorException e ) 
+        catch ( BuildErrorException e )
         {
             buildJob.setResult( BuildJob.Result.ERROR );
             buildJob.setFailureMessage( e.getMessage() );
@@ -1274,7 +1277,7 @@ public abstract class AbstractInvokerMoj
      * @return <code>true</code> if the project was launched or <code>false</code> if the selector script indicated that
      *            the project should be skipped.
      * @throws org.apache.maven.plugin.MojoExecutionException If the project could not be launched.
-     * @throws org.apache.maven.plugin.invoker.BuildFailureException If either a hook script or the build itself failed.
+     * @throws org.apache.maven.shared.scriptinterpreter.BuildFailureException If either a hook script or the build itself failed.
      */
     private boolean runBuild( File basedir, File pomFile, File settingsFile, InvokerProperties invokerProperties )
         throws MojoExecutionException, BuildFailureException
@@ -1517,7 +1520,7 @@ public abstract class AbstractInvokerMoj
      * @param invocationIndex The index of the invocation for which to check the exit code, must not be negative.
      * @param invokerProperties The invoker properties used to check the exit code, must not be <code>null</code>.
      * @param logger The build logger, may be <code>null</code> if logging is disabled.
-     * @throws org.apache.maven.plugin.invoker.BuildFailureException If the invocation result indicates a build failure.
+     * @throws org.apache.maven.shared.scriptinterpreter.BuildFailureException If the invocation result indicates a build failure.
      */
     private void verify( InvocationResult result, int invocationIndex, InvokerProperties invokerProperties,
                          FileLogger logger )

Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java?rev=1194938&r1=1194937&r2=1194938&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/FileLogger.java Sat Oct 29 17:22:16 2011
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.invoker;
 
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.invoker.InvocationOutputHandler;
+import org.apache.maven.shared.scriptinterpreter.ExecutionLogger;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.File;
@@ -32,7 +33,7 @@ import java.io.PrintStream;
  * @version $Id$
  */
 class FileLogger
-    implements InvocationOutputHandler
+    implements InvocationOutputHandler, ExecutionLogger
 {
 
     /**