maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r373077 - in /maven/surefire/trunk: surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java surefire/pom.xml
Date Sat, 28 Jan 2006 03:45:12 GMT
Author: jvanzyl
Date: Fri Jan 27 19:45:09 2006
New Revision: 373077

URL: http://svn.apache.org/viewcvs?rev=373077&view=rev
Log:
MSUREFIRE-52 System properties are now passed on properly in fork mode.

Modified:
    maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
    maven/surefire/trunk/surefire/pom.xml

Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java?rev=373077&r1=373076&r2=373077&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
(original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/SurefireBooter.java
Fri Jan 27 19:45:09 2006
@@ -74,9 +74,9 @@
     private Properties systemProperties;
 
     private String argLine;
-    
+
     private Map environmentVariables;
-    
+
     private File workingDirectory;
 
     private boolean childDelegation;
@@ -181,7 +181,7 @@
     {
         this.environmentVariables = environmentVariables;
     }
-    
+
     public void setBasedir( String basedir )
     {
         this.basedir = basedir;
@@ -190,7 +190,7 @@
     public void setWorkingDirectory( File dir )
     {
         this.workingDirectory = dir;
-    }    
+    }
 
     public void setChildDelegation( boolean childDelegation )
     {
@@ -349,28 +349,28 @@
         {
             cli.addArguments( StringUtils.split( argLine, " " ) );
         }
-        
+
         if ( environmentVariables != null)
         {
             Iterator iter = environmentVariables.keySet().iterator();
-            
+
             while ( iter.hasNext() )
             {
                 String key = (String) iter.next();
-                
+
                 String value = (String) environmentVariables.get( key );
-                
+
                 cli.addEnvironment( key, value );
-                
+
                 if ( debug )
                 {
                     System.out.println( "Environment: " + key + "="  + value + " added."
);
                 }
-                
+
             }
-            
+
         }
-        
+
         if ( workingDirectory != null )
         {
             cli.setWorkingDirectory( workingDirectory.getAbsolutePath() );
@@ -501,12 +501,18 @@
             else
             {
                 if ( cp.length() == 0 )
+                {
                     cp = url;
+                }
                 else
+                {
                     cp += ":" + url;
+                }
             }
         }
+
         p.setProperty( "classpath", cp );
+
         p.setProperty( "childDelegation", "" + childDelegation );
 
         FileOutputStream fos = new FileOutputStream( new File( basedir, CLASSLOADER_PROPERTIES
) );

Modified: maven/surefire/trunk/surefire/pom.xml
URL: http://svn.apache.org/viewcvs/maven/surefire/trunk/surefire/pom.xml?rev=373077&r1=373076&r2=373077&view=diff
==============================================================================
--- maven/surefire/trunk/surefire/pom.xml (original)
+++ maven/surefire/trunk/surefire/pom.xml Fri Jan 27 19:45:09 2006
@@ -20,4 +20,4 @@
       <version>1.0.5</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message