cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r888228 - in /cxf/branches/2.2.x-fixes: ./ parent/pom.xml testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Date Tue, 08 Dec 2009 02:27:54 GMT
Author: dkulp
Date: Tue Dec  8 02:27:53 2009
New Revision: 888228

URL: http://svn.apache.org/viewvc?rev=888228&view=rev
Log:
Merged revisions 887271 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r887271 | dkulp | 2009-12-04 12:07:20 -0500 (Fri, 04 Dec 2009) | 2 lines
  
  Separate the flags for the surefire forking from the flags used for the
  ServerLauncher for forking.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/parent/pom.xml
    cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=888228&r1=888227&r2=888228&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Tue Dec  8 02:27:53 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>
@@ -294,8 +295,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/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=888228&r1=888227&r2=888228&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
(original)
+++ cxf/branches/2.2.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
Tue Dec  8 02:27:53 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 {



Mime
View raw message