cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1332850 - in /cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common: AbstractBusClientServerTestBase.java ServerLauncher.java
Date Tue, 01 May 2012 21:45:47 GMT
Author: dkulp
Date: Tue May  1 21:45:46 2012
New Revision: 1332850

URL: http://svn.apache.org/viewvc?rev=1332850&view=rev
Log:
Make sure the jaxws 2.2 version is actually tested when appropriate.
Make forked server use same tmp dir

Modified:
    cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java
    cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java

Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java?rev=1332850&r1=1332849&r2=1332850&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java
(original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java
Tue May  1 21:45:46 2012
@@ -35,10 +35,6 @@ import org.junit.AfterClass;
 
 public abstract class AbstractBusClientServerTestBase extends AbstractClientServerTestBase
{
 
-    static {
-        System.setProperty("javax.xml.ws.spi.Provider", "org.apache.cxf.jaxws.spi.ProviderImpl");
-    }
-    
     protected static String defaultConfigFileName;
     protected static Bus staticBus; 
     

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=1332850&r1=1332849&r2=1332850&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 Tue
May  1 21:45:46 2012
@@ -382,7 +382,6 @@ public class ServerLauncher {
             cmd.add(vmargs);
         }
         
-        cmd.add("-Djavax.xml.ws.spi.Provider=org.apache.cxf.jaxws.spi.ProviderImpl");
         String portClose = System.getProperty("org.apache.cxf.transports.http_jetty.DontClosePort");
         if (portClose != null) {
             cmd.add("-Dorg.apache.cxf.transports.http_jetty.DontClosePort=" + portClose);
@@ -429,6 +428,10 @@ public class ServerLauncher {
         if (null != derbyHome) {
             cmd.add("-Dderby.system.home=" + derbyHome);
         }
+        String tmp = System.getProperty("java.io.tmpdir");
+        if (null != tmp) {
+            cmd.add("-Djava.io.tmpdir=" + tmp);
+        }
         
         cmd.add(className);
 



Mime
View raw message