You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/01/28 04:46:29 UTC
svn commit: r373078 -
/maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
Author: jvanzyl
Date: Fri Jan 27 19:46:25 2006
New Revision: 373078
URL: http://svn.apache.org/viewcvs?rev=373078&view=rev
Log:
MSUREFIRE-52 Make sure that system properties are passed on correctly in fork mode.
Modified:
maven/plugins/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/test/SurefirePlugin.java
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=373078&r1=373077&r2=373078&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 27 19:46:25 2006
@@ -245,34 +245,6 @@
SurefireBooter surefireBooter = new SurefireBooter();
// ----------------------------------------------------------------------
- // Forking
- // ----------------------------------------------------------------------
-
- surefireBooter.setForkMode( forkMode );
-
- if ( !forkMode.equals( "none" ) )
- {
- surefireBooter.setSystemProperties( systemProperties );
-
- surefireBooter.setJvm( jvm );
-
- surefireBooter.setBasedir( basedir.getAbsolutePath() );
-
- surefireBooter.setArgLine( argLine );
-
- surefireBooter.setEnvironmentVariables( environmentVariables );
-
- surefireBooter.setWorkingDirectory( workingDirectory );
-
- surefireBooter.setChildDelegation( childDelegation );
-
- if ( getLog().isDebugEnabled() )
- {
- surefireBooter.setDebug( true );
- }
- }
-
- // ----------------------------------------------------------------------
// Reporting
// ----------------------------------------------------------------------
@@ -322,25 +294,6 @@
//
// ----------------------------------------------------------------------
- System.setProperty( "basedir", basedir.getAbsolutePath() );
-
- System.setProperty( "localRepository", localRepository.getBasedir() );
-
- // Add all system properties configured by the user
- if ( systemProperties != null )
- {
- Enumeration propertyKeys = systemProperties.propertyNames();
-
- while ( propertyKeys.hasMoreElements() )
- {
- String key = (String) propertyKeys.nextElement();
-
- System.setProperty( key, systemProperties.getProperty( key ) );
-
- getLog().debug( "Setting system property [" + key + "]=[" + systemProperties.getProperty( key ) + "]" );
- }
- }
-
getLog().debug( "Test Classpath :" );
getLog().debug( testClassesDirectory.getPath() );
@@ -379,6 +332,36 @@
addReporters( surefireBooter );
+ processSystemProperties();
+
+ // ----------------------------------------------------------------------
+ // Forking
+ // ----------------------------------------------------------------------
+
+ surefireBooter.setForkMode( forkMode );
+
+ if ( !forkMode.equals( "none" ) )
+ {
+ surefireBooter.setSystemProperties( System.getProperties() );
+
+ surefireBooter.setJvm( jvm );
+
+ surefireBooter.setBasedir( basedir.getAbsolutePath() );
+
+ surefireBooter.setArgLine( argLine );
+
+ surefireBooter.setEnvironmentVariables( environmentVariables );
+
+ surefireBooter.setWorkingDirectory( workingDirectory );
+
+ surefireBooter.setChildDelegation( childDelegation );
+
+ if ( getLog().isDebugEnabled() )
+ {
+ surefireBooter.setDebug( true );
+ }
+ }
+
boolean success;
try
@@ -402,6 +385,28 @@
else
{
throw new MojoExecutionException( msg );
+ }
+ }
+ }
+
+ protected void processSystemProperties()
+ {
+ System.setProperty( "basedir", basedir.getAbsolutePath() );
+
+ System.setProperty( "localRepository", localRepository.getBasedir() );
+
+ // Add all system properties configured by the user
+ if ( systemProperties != null )
+ {
+ Enumeration propertyKeys = systemProperties.propertyNames();
+
+ while ( propertyKeys.hasMoreElements() )
+ {
+ String key = (String) propertyKeys.nextElement();
+
+ System.setProperty( key, systemProperties.getProperty( key ) );
+
+ getLog().debug( "Setting system property [" + key + "]=[" + systemProperties.getProperty( key ) + "]" );
}
}
}