svn commit: r370953 - in /maven/plugins/trunk/maven-surefire-plugin: pom.xml src/main/java/org/apache/maven/test/SurefirePlugin.java

[da...@apache.org]

Author: dantran
Date: Fri Jan 20 17:58:22 2006
New Revision: 370953

URL: http://svn.apache.org/viewcvs?rev=370953&view=rev
Log:
add environmentVariable and workingDirectory for fork mode

Modified:
    maven/plugins/trunk/maven-surefire-plugin/pom.xml
    maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java

Modified: maven/plugins/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/pom.xml?rev=370953&r1=370952&r2=370953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-surefire-plugin/pom.xml Fri Jan 20 17:58:22 2006
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-booter</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.3-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>

Modified: maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=370953&r1=370952&r2=370953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java (original)
+++ maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java Fri Jan 20 17:58:22 2006
@@ -26,8 +26,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -197,6 +199,20 @@
     private String argLine;
 
     /**
+     * Additional environments to set on the command line.
+     *
+     * @parameter 
+     */
+    private Map environmentVariables = new HashMap();
+    
+    /**
+     * Command line working directory.
+     *
+     * @parameter 
+     */
+    private File workingDirectory;
+        
+    /**
      * Option to specify the jvm (or path to the java executable) to use with
      * the forking options. For the default we will assume that java is in the path.
      *
@@ -243,6 +259,10 @@
             surefireBooter.setBasedir( basedir.getAbsolutePath() );
 
             surefireBooter.setArgLine( argLine );
+            
+            surefireBooter.setEnvironmentVariables( environmentVariables );
+            
+            surefireBooter.setWorkingDirectory( workingDirectory );
 
             surefireBooter.setChildDelegation( childDelegation );