Author: krosenvold
Date: Wed Dec 29 13:41:23 2010
New Revision: 1053633
URL: http://svn.apache.org/viewvc?rev=1053633&view=rev
Log:
[SUREFIRE-676] Default values declared through annotation
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java?rev=1053633&r1=1053632&r2=1053633&view=diff
==============================================================================
---
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
(original)
+++
maven/surefire/trunk/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/IntegrationTestMojo.java
Wed Dec 29 13:41:23 2010
@@ -552,12 +552,12 @@ public class IntegrationTestMojo
/**
* Option to pass dependencies to the system's classloader instead of
using an isolated class loader when forking.
* Prevents problems with JDKs which implement the service provider lookup
mechanism by using the system's
- * classloader. Default value is "true".
+ * classloader.
*
- * @parameter expression="${failsafe.useSystemClassLoader}"
+ * @parameter expression="${failsafe.useSystemClassLoader}"
default-value="true"
* @since 2.3
*/
- private Boolean useSystemClassLoader;
+ private boolean useSystemClassLoader;
/**
* By default, Surefire forks your tests using a manifest-only JAR; set
this parameter
@@ -615,11 +615,11 @@ public class IntegrationTestMojo
/**
* Defines the order the tests will be run in. Supported values are
"alphabetical", "reversealphabetical",
* "random", "hourly" (alphabetical on even hours, reverse alphabetical on
odd hours) and "filesystem".<p/>
- * Not supplying a value for this setting will run tests in filesystem
order.<p/>
+ * <p/>
* Odd/Even for hourly is determined at the time the of scanning the
classpath, meaning it could change during
* a multi-module build.
*
- * @parameter
+ * @parameter default-value="filesystem"
* @since 2.7
*/
private String runOrder;
@@ -1285,12 +1285,12 @@ public class IntegrationTestMojo
this.disableXmlReport = disableXmlReport;
}
- public Boolean getUseSystemClassLoader()
+ public boolean isUseSystemClassLoader()
{
return useSystemClassLoader;
}
- public void setUseSystemClassLoader( Boolean useSystemClassLoader )
+ public void setUseSystemClassLoader( boolean useSystemClassLoader )
{
this.useSystemClassLoader = useSystemClassLoader;
}
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java?rev=1053633&r1=1053632&r2=1053633&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
Wed Dec 29 13:41:23 2010
@@ -524,7 +524,7 @@ public abstract class AbstractSurefireMo
if ( fork.isForking() )
{
- setUseSystemClassLoader( getUseSystemClassLoader() == null ?
Boolean.TRUE : getUseSystemClassLoader() );
+ setUseSystemClassLoader( isUseSystemClassLoader() );
fork.setSystemProperties( getInternalSystemProperties() );
@@ -579,7 +579,7 @@ public abstract class AbstractSurefireMo
protected ClassLoaderConfiguration getClassLoaderConfiguration(
ForkConfiguration fork )
{
- return fork.isForking() ? new ClassLoaderConfiguration(
getUseSystemClassLoader().booleanValue(),
+ return fork.isForking() ? new ClassLoaderConfiguration(
isUseSystemClassLoader(),
isUseManifestOnlyJar() )
: new ClassLoaderConfiguration( false, false );
}
@@ -901,7 +901,7 @@ public abstract class AbstractSurefireMo
protected void warnIfUselessUseSystemClassLoaderParameter()
{
- if ( getUseSystemClassLoader() != null && isForkModeNever() )
+ if ( isUseSystemClassLoader() && isForkModeNever() )
{
getLog().warn( "useSystemClassloader setting has no effect when
not forking" );
}
Modified:
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java?rev=1053633&r1=1053632&r2=1053633&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
(original)
+++
maven/surefire/trunk/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireExecutionParameters.java
Wed Dec 29 13:41:23 2010
@@ -240,9 +240,9 @@ public interface SurefireExecutionParame
void setDisableXmlReport( boolean disableXmlReport );
- Boolean getUseSystemClassLoader();
+ boolean isUseSystemClassLoader();
- void setUseSystemClassLoader( Boolean useSystemClassLoader );
+ void setUseSystemClassLoader( boolean useSystemClassLoader );
boolean isUseManifestOnlyJar();
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=1053633&r1=1053632&r2=1053633&view=diff
==============================================================================
---
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Wed Dec 29 13:41:23 2010
@@ -518,12 +518,12 @@ public class SurefirePlugin
/**
* Option to pass dependencies to the system's classloader instead of
using an isolated class loader when forking.
* Prevents problems with JDKs which implement the service provider lookup
mechanism by using the system's
- * classloader. Default value is "true".
+ * classloader.
*
- * @parameter expression="${surefire.useSystemClassLoader}"
+ * @parameter expression="${surefire.useSystemClassLoader}"
default-value="true"
* @since 2.3
*/
- private Boolean useSystemClassLoader;
+ private boolean useSystemClassLoader;
/**
* By default, Surefire forks your tests using a manifest-only JAR; set
this parameter
@@ -576,11 +576,11 @@ public class SurefirePlugin
/**
* Defines the order the tests will be run in. Supported values are
"alphabetical", "reversealphabetical",
* "random", "hourly" (alphabetical on even hours, reverse alphabetical on
odd hours) and "filesystem".<p/>
- * Not supplying a value for this setting will run tests in filesystem
order.<p/>
+ * <p/>
* Odd/Even for hourly is determined at the time the of scanning the
classpath, meaning it could change during
* a multi-module build.
*
- * @parameter
+ * @parameter default-value="filesystem"
* @since 2.7
*/
private String runOrder;
@@ -1202,12 +1202,12 @@ public class SurefirePlugin
this.disableXmlReport = disableXmlReport;
}
- public Boolean getUseSystemClassLoader()
+ public boolean isUseSystemClassLoader()
{
return useSystemClassLoader;
}
- public void setUseSystemClassLoader( Boolean useSystemClassLoader )
+ public void setUseSystemClassLoader( boolean useSystemClassLoader )
{
this.useSystemClassLoader = useSystemClassLoader;
}
