Author: dkulp Date: Fri May 4 17:52:41 2012 New Revision: 1334091 URL: http://svn.apache.org/viewvc?rev=1334091&view=rev Log: Merged revisions 1333538 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1333538 | dkulp | 2012-05-03 12:42:53 -0400 (Thu, 03 May 2012) | 10 lines Merged revisions 1332850 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1332850 | dkulp | 2012-05-01 17:45:46 -0400 (Tue, 01 May 2012) | 3 lines Make sure the jaxws 2.2 version is actually tested when appropriate. Make forked server use same tmp dir ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java?rev=1334091&r1=1334090&r2=1334091&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java (original) +++ cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusClientServerTestBase.java Fri May 4 17:52:41 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/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java?rev=1334091&r1=1334090&r2=1334091&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java (original) +++ cxf/branches/2.4.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java Fri May 4 17:52:41 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);
