You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/12/04 18:07:26 UTC
svn commit: r887271 - in /cxf/trunk: parent/pom.xml
testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Author: dkulp
Date: Fri Dec 4 17:07:20 2009
New Revision: 887271
URL: http://svn.apache.org/viewvc?rev=887271&view=rev
Log:
Separate the flags for the surefire forking from the flags used for the
ServerLauncher for forking.
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=887271&r1=887270&r2=887271&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Fri Dec 4 17:07:20 2009
@@ -37,6 +37,7 @@
<surefire.format>brief</surefire.format>
<surefire.usefile>false</surefire.usefile>
<surefire.fork.vmargs>-ea</surefire.fork.vmargs>
+ <server.launcher.vmargs>-ea</server.launcher.vmargs>
<surefire.extra.sysprop.name1>None</surefire.extra.sysprop.name1>
<surefire.extra.sysprop.value1>None</surefire.extra.sysprop.value1>
<compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
@@ -299,8 +300,8 @@
<value>${spring.validation.mode}</value>
</property>
<property>
- <name>surefire.fork.vmargs</name>
- <value>${surefire.fork.vmargs}</value>
+ <name>server.launcher.vmargs</name>
+ <value>${server.launcher.vmargs}</value>
</property>
<property>
<name>${extra.surefire.syspropery.name}</name>
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=887271&r1=887270&r2=887271&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Fri Dec 4 17:07:20 2009
@@ -343,7 +343,7 @@
if (Boolean.getBoolean("java.awt.headless")) {
cmd.add("-Djava.awt.headless=true");
}
- String vmargs = System.getProperty("surefire.fork.vmargs");
+ String vmargs = System.getProperty("server.launcher.vmargs");
if (StringUtils.isEmpty(vmargs)) {
cmd.add("-ea");
} else {