Author: jdcasey
Date: Tue Aug 8 15:24:06 2006
New Revision: 429859
URL: http://svn.apache.org/viewvc?rev=429859&view=rev
Log:
changing pom to use new parent, and added sysout/syserr handling for scripts.
Modified:
maven/sandbox/plugins/maven-invoker-plugin/pom.xml
maven/sandbox/plugins/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Modified: maven/sandbox/plugins/maven-invoker-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-invoker-plugin/pom.xml?rev=429859&r1=429858&r2=429859&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-invoker-plugin/pom.xml (original)
+++ maven/sandbox/plugins/maven-invoker-plugin/pom.xml Tue Aug 8 15:24:06 2006
@@ -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>
Modified:
maven/sandbox/plugins/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=429859&r1=429858&r2=429859&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
(original)
+++
maven/sandbox/plugins/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
Tue Aug 8 15:24:06 2006
@@ -37,6 +37,7 @@
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 @@
{
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 @@
finally
{
IOUtil.close( reader );
+ System.setErr( origErr );
+ System.setOut( origOut );
}
if ( !noLog )
