[maven-invoker-plugin] 02/24: changing pom to use new parent, and added sysout/syserr handling for scripts.

[hboutemy]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to annotated tag maven-invoker-plugin-1.0
in repository https://gitbox.apache.org/repos/asf/maven-invoker-plugin.git

commit 9545d355ef3aac1cf185ec20852d591657985159
Author: John Dennis Casey <jdca...@apache.org>
AuthorDate: Tue Aug 8 22:24:06 2006 +0000

    changing pom to use new parent, and added sysout/syserr handling for 
scripts.
    
    git-svn-id: 
https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-invoker-plugin@429859
 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            |  4 ++--
 .../apache/maven/plugin/invoker/InvokerMojo.java   | 25 +++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index d71967b..7162b00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,9 +5,9 @@
 >
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>maven-plugin-parent</artifactId>
+    <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>2.0.1</version>
+    <version>2-SNAPSHOT</version>
   </parent>
   <artifactId>maven-invoker-plugin</artifactId>
   <version>1.0-SNAPSHOT</version>
diff --git a/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java 
b/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
index 91656ce..685cc73 100644
--- a/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
+++ b/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
@@ -37,6 +37,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -420,17 +421,23 @@ public class InvokerMojo
         {
             final Interpreter engine = new Interpreter();
 
-            if ( !noLog )
-            {
-                logger.consumeLine( "Running " + scriptDescription + " in: " + 
script );
-
-                engine.setErr( logger.getPrintStream() );
-                engine.setOut( logger.getPrintStream() );
-            }
-
+            PrintStream origOut = System.out;
+            PrintStream origErr = System.err;
+            
             FileReader reader = null;
             try
             {
+                if ( !noLog )
+                {
+                    logger.consumeLine( "Running " + scriptDescription + " in: 
" + script );
+
+                    System.setErr( logger.getPrintStream() );
+                    System.setOut( logger.getPrintStream() );
+                    
+                    engine.setErr( logger.getPrintStream() );
+                    engine.setOut( logger.getPrintStream() );
+                }
+
                 engine.set( "basedir", basedir );
 
                 reader = new FileReader( script );
@@ -442,6 +449,8 @@ public class InvokerMojo
             finally
             {
                 IOUtil.close( reader );
+                System.setErr( origErr );
+                System.setOut( origOut );
             }
 
             if ( !noLog )

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <commits@maven.apache.org>.