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 2012/05/22 23:34:45 UTC
svn commit: r1341645 - in /cxf/branches/2.5.x-fixes: ./
systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/
systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/
systests/uncategorized/src/test/java/org/apache/cxf/systest/b...
Author: dkulp
Date: Tue May 22 21:34:43 2012
New Revision: 1341645
URL: http://svn.apache.org/viewvc?rev=1341645&view=rev
Log:
Merged revisions 1339011 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1339011 | dkulp | 2012-05-16 01:16:27 -0400 (Wed, 16 May 2012) | 1 line
Some cleanup in the uncategorized tests
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl11.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap12ClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTestImpl.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFindClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java Tue May 22 21:34:43 2012
@@ -34,7 +34,8 @@ public class RespectBindingFeatureClient
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java Tue May 22 21:34:43 2012
@@ -31,11 +31,13 @@ import org.apache.hello_world_soap_http.
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
+ Endpoint ep;
+
protected void run() {
String address;
Object implementor = new RPCLitGreeterImpl();
address = "http://localhost:" + PORT + "/SOAPServiceRPCLit/SoapPort";
- Endpoint ep = Endpoint.create(implementor);
+ ep = Endpoint.create(implementor);
URL wsdl = getClass().getResource("/wsdl_systest/cxf2006.wsdl");
((EndpointImpl)ep).setWsdlLocation(wsdl.toString());
@@ -43,6 +45,11 @@ public class Server extends AbstractBusT
((EndpointImpl)ep).getOutInterceptors().add(new LoggingOutInterceptor());
ep.publish(address);
}
+
+ public void tearDown() {
+ ep.stop();
+ ep = null;
+ }
public static void main(String[] args) {
try {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/DOCBareClientServerTest.java Tue May 22 21:34:43 2012
@@ -34,6 +34,8 @@ import org.apache.cxf.testutil.common.Ab
import org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType;
import org.apache.hello_world_doc_lit_bare.SOAPService;
import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
+
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -48,7 +50,11 @@ public class DOCBareClientServerTest ext
@BeforeClass
public static void startServers() throws Exception {
System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory");
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ }
+ @AfterClass
+ public static void reset() {
+ System.clearProperty("org.apache.cxf.bus.factory");
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java Tue May 22 21:34:43 2012
@@ -38,8 +38,8 @@ public class PutLastTradedPriceImpl impl
inout.value.setTickerSymbol("APACHE");
}
public void putLastTradedPrice(TradePriceData body) {
- System.out.println("-----TradePriceData TickerPrice : ----- " + body.getTickerPrice());
- System.out.println("-----TradePriceData TickerSymbol : ----- " + body.getTickerSymbol());
+ //System.out.println("-----TradePriceData TickerPrice : ----- " + body.getTickerPrice());
+ //System.out.println("-----TradePriceData TickerSymbol : ----- " + body.getTickerSymbol());
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/Server.java Tue May 22 21:34:43 2012
@@ -31,12 +31,13 @@ import org.apache.cxf.testutil.common.Ab
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
-
+ Endpoint ep;
+
protected void run() {
System.setProperty("org.apache.cxf.bus.factory", "org.apache.cxf.bus.CXFBusFactory");
Object implementor = new PutLastTradedPriceImpl();
String address = "http://localhost:" + PORT + "/SOAPDocLitBareService/SoapPort";
- Endpoint ep = Endpoint.create(implementor);
+ ep = Endpoint.create(implementor);
Map<String, Object> props = new HashMap<String, Object>(2);
props.put(Endpoint.WSDL_SERVICE, new QName("http://apache.org/hello_world_doc_lit_bare",
"SOAPService"));
@@ -45,6 +46,10 @@ public class Server extends AbstractBusT
ep.publish(address);
}
+ public void tearDown() {
+ ep.stop();
+ ep = null;
+ }
public static void main(String[] args) {
try {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusExtensionLoadingTest.java Tue May 22 21:34:43 2012
@@ -57,6 +57,7 @@ public class BusExtensionLoadingTest ext
};
Bus bus = factory.createBus();
assertNotNullExtensions(bus);
+ bus.shutdown(true);
} finally {
Thread.currentThread().setContextClassLoader(origClassLoader);
}
@@ -72,6 +73,7 @@ public class BusExtensionLoadingTest ext
BusFactory factory = new CXFBusFactory();
Bus bus = factory.createBus();
assertNotNullExtensions(bus);
+ bus.shutdown(true);
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java Tue May 22 21:34:43 2012
@@ -28,33 +28,22 @@ import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.test.TestUtilities;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.testutil.common.TestUtil;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.ConnectionType;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
public class BusShutdownTest extends Assert {
public static final String PORT = TestUtil.getPortNumber(BusShutdownTest.class);
-
-
- @BeforeClass
- public static void setKeepAliveProperty() {
- TestUtilities.setKeepAliveSystemProperty(false);
- }
-
- @AfterClass
- public static void cleanKeepAliveProperty() {
- TestUtilities.recoverKeepAliveSystemProperty();
- }
-
-
@Test
public void testStartWorkShutdownWork() throws Exception {
@@ -84,10 +73,11 @@ public class BusShutdownTest extends Ass
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
SpringBusFactory.setDefaultBus(bus);
- createService(address);
+ Endpoint ep = createService(address);
doWork(wsdlUrl, address);
// this should revert the JVM to its original state pending gc
- bus.shutdown(false);
+ ep.stop();
+ bus.shutdown(true);
}
private void doWork(URL wsdlUrl, String address) {
@@ -100,13 +90,17 @@ public class BusShutdownTest extends Ass
BindingProvider bp = (BindingProvider)handler;
bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
address);
- // invoke twoway call
- greeter.sayHi();
+ Client client = ClientProxy.getClient(greeter);
+ HTTPConduit c = (HTTPConduit)client.getConduit();
+ c.setClient(new HTTPClientPolicy());
+ c.getClient().setConnection(ConnectionType.CLOSE);
+ // invoke twoway call
+ greeter.sayHi();
}
- private void createService(String address) {
+ private Endpoint createService(String address) {
Object impl = new GreeterImpl();
- Endpoint.publish(address, impl);
+ return Endpoint.publish(address, impl);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java Tue May 22 21:34:43 2012
@@ -54,6 +54,7 @@ public class SpringBusFactoryTest extend
checkOtherCoreExtensions(bus);
//you should include instumentation extenstion to get the instrumentation manager
assertNotNull("No instrumentation manager", bus.getExtension(InstrumentationManager.class));
+ bus.shutdown(true);
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java Tue May 22 21:34:43 2012
@@ -46,6 +46,7 @@ public class CallbackClientServerTest ex
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly", launchServer(Server.class, true));
+ createStaticBus();
}
@Test
@@ -66,7 +67,7 @@ public class CallbackClientServerTest ex
EndpointReference w3cEpr = ep.getEndpointReference();
String resp = port.registerCallback((W3CEndpointReference)w3cEpr);
assertEquals("registerCallback called", resp);
-
+ ep.stop();
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java Tue May 22 21:34:43 2012
@@ -22,16 +22,23 @@ package org.apache.cxf.systest.callback;
import javax.xml.ws.Endpoint;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
+ Endpoint ep;
+
protected void run() {
+ setBus(BusFactory.getDefaultBus());
Object implementor = new ServerImpl();
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
- Endpoint.publish(address, implementor);
-
+ ep = Endpoint.publish(address, implementor);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
}
public static void main(String[] args) {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java Tue May 22 21:34:43 2012
@@ -95,10 +95,10 @@ public class FailoverAddressOverrideTest
@Before
public void setUp() {
- targets = new ArrayList<String>();
SpringBusFactory bf = new SpringBusFactory();
bus = bf.createBus(getConfig());
BusFactory.setDefaultBus(bus);
+ targets = new ArrayList<String>();
}
@After
@@ -112,6 +112,7 @@ public class FailoverAddressOverrideTest
targets = null;
if (bus != null) {
bus.shutdown(true);
+ bus = null;
}
}
@@ -195,7 +196,7 @@ public class FailoverAddressOverrideTest
protected String getCurrentEndpoint(Object proxy) {
return ClientProxy.getClient(proxy).getEndpoint().getEndpointInfo().getAddress();
}
-
+
protected void setupGreeterA() throws Exception {
greeter = new ClusteredGreeterService().getReplicatedPortA();
updateAddressPort(greeter, PORT_A);
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java Tue May 22 21:34:43 2012
@@ -123,6 +123,7 @@ public class FailoverTest extends Abstra
targets = null;
if (bus != null) {
bus.shutdown(true);
+ bus = null;
}
}
@@ -162,6 +163,9 @@ public class FailoverTest extends Abstra
// java.net.ConnectionException on the unavailable
// replica A
//
+ if (!(cause instanceof ConnectException)) {
+ cause.printStackTrace();
+ }
assertTrue("should revert to original exception when no failover: "
+ cause,
cause instanceof ConnectException);
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java Tue May 22 21:34:43 2012
@@ -35,6 +35,8 @@ public class Server extends AbstractBusT
private static final String TARGETS_CONFIG =
"org/apache/cxf/systest/clustering/targets.xml";
+ Endpoint ep;
+
protected void run() {
SpringBusFactory factory = new SpringBusFactory();
@@ -43,7 +45,11 @@ public class Server extends AbstractBusT
setBus(bus);
ControlImpl implementor = new ControlImpl();
- Endpoint.publish(ADDRESS, implementor);
+ ep = Endpoint.publish(ADDRESS, implementor);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
}
public static void main(String[] args) {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover.xml Tue May 22 21:34:43 2012
@@ -21,9 +21,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:clustering="http://cxf.apache.org/clustering"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="Sequential" class="org.apache.cxf.clustering.SequentialStrategy"/>
@@ -57,5 +59,8 @@ http://www.springframework.org/schema/be
</clustering:failover>
</jaxws:features>
</jaxws:client>
+ <http:conduit name="http://localhost:.*">
+ <http:client Connection="close"/>
+ </http:conduit>
</beans>
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml Tue May 22 21:34:43 2012
@@ -22,10 +22,12 @@
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:clustering="http://cxf.apache.org/clustering"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
xsi:schemaLocation="
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -89,5 +91,7 @@ http://www.springframework.org/schema/ut
</clustering:failover>
</jaxws:features>
</jaxws:client>
-
+ <http:conduit name="http://localhost:.*">
+ <http:client Connection="close"/>
+ </http:conduit>
</beans>
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor.xml Tue May 22 21:34:43 2012
@@ -19,11 +19,13 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:clustering="http://cxf.apache.org/clustering"
xsi:schemaLocation="
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="Sequential" class="org.apache.cxf.systest.clustering.LoadDistributorSequentialStrategy"/>
@@ -61,5 +63,7 @@ http://www.springframework.org/schema/be
</clustering:loadDistributor>
</jaxws:features>
</jaxws:client>
-
+ <http:conduit name="http://localhost:.*">
+ <http:client Connection="close"/>
+ </http:conduit>
</beans>
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml Tue May 22 21:34:43 2012
@@ -21,10 +21,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:clustering="http://cxf.apache.org/clustering"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/clustering http://cxf.apache.org/schemas/clustering.xsd
+http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
@@ -91,5 +93,7 @@ http://www.springframework.org/schema/ut
</clustering:loadDistributor>
</jaxws:features>
</jaxws:client>
-
+ <http:conduit name="http://localhost:.*">
+ <http:client Connection="close"/>
+ </http:conduit>
</beans>
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java Tue May 22 21:34:43 2012
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import org.apache.cxf.BusFactory;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
@@ -35,8 +35,8 @@ import org.apache.cxf.wsdl.EndpointRefer
targetNamespace = "http://cxf.apache.org/factory_pattern")
public class HttpNumberFactoryImpl extends NumberFactoryImpl {
- public HttpNumberFactoryImpl() {
- super();
+ public HttpNumberFactoryImpl(Bus bus) {
+ super(bus);
// do servant creation up front so manual epr creation test has endpoint to talk to.
// the manual epr will not come from create()
//
@@ -48,7 +48,7 @@ public class HttpNumberFactoryImpl exten
EndpointReferenceType epr = EndpointReferenceUtils.getEndpointReferenceWithId(NUMBER_SERVICE_QNAME,
portName,
id,
- BusFactory.getDefaultBus());
+ bus);
Source source = EndpointReferenceUtils.convertToXML(epr);
return new W3CEndpointReference(source);
@@ -61,7 +61,7 @@ public class HttpNumberFactoryImpl exten
String wsdlLocation = "testutils/factory_pattern.wsdl";
String bindingId = null;
EndpointImpl ep =
- new EndpointImpl(BusFactory.getDefaultBus(), servant, bindingId, wsdlLocation);
+ new EndpointImpl(bus, servant, bindingId, wsdlLocation);
ep.setEndpointName(new QName(NUMBER_SERVICE_QNAME.getNamespaceURI(), "NumberPort"));
ep.publish(NUMBER_SERVANT_ADDRESS_ROOT);
templateEpr = ep.getServer().getDestination().getAddress();
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualHttpMulitplexClientServerTest.java Tue May 22 21:34:43 2012
@@ -29,6 +29,7 @@ import javax.xml.ws.Endpoint;
import javax.xml.ws.Service;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.factory_pattern.IsEvenResponse;
import org.apache.cxf.factory_pattern.Number;
@@ -50,10 +51,15 @@ public class ManualHttpMulitplexClientSe
static final String FACTORY_ADDRESS = NumberFactoryImpl.FACTORY_ADDRESS;
public static class Server extends AbstractBusTestServerBase {
-
+ Endpoint ep;
protected void run() {
- Object implementor = new ManualNumberFactoryImpl();
- Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ setBus(BusFactory.getDefaultBus());
+ Object implementor = new ManualNumberFactoryImpl(getBus());
+ ep = Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
}
public static void main(String[] args) {
@@ -72,7 +78,8 @@ public class ManualHttpMulitplexClientSe
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class));
+ launchServer(Server.class, true));
+ createStaticBus();
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java Tue May 22 21:34:43 2012
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import org.apache.cxf.BusFactory;
+import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.wsdl.EndpointReferenceUtils;
@@ -35,6 +35,10 @@ import org.apache.cxf.wsdl.EndpointRefer
targetNamespace = "http://cxf.apache.org/factory_pattern")
public class ManualNumberFactoryImpl extends NumberFactoryImpl {
+ public ManualNumberFactoryImpl(Bus b) {
+ super(b);
+ }
+
public W3CEndpointReference create(String id) {
manageNumberServantInitialisation();
@@ -51,7 +55,7 @@ public class ManualNumberFactoryImpl ext
String wsdlLocation = "testutils/factory_pattern.wsdl";
String bindingId = null;
EndpointImpl ep =
- new EndpointImpl(BusFactory.getDefaultBus(), servant, bindingId, wsdlLocation);
+ new EndpointImpl(bus, servant, bindingId, wsdlLocation);
ep.setEndpointName(new QName(NUMBER_SERVICE_QNAME.getNamespaceURI(), "NumberPort"));
ep.publish(NUMBER_SERVANT_ADDRESS_ROOT);
templateEpr = ep.getServer().getDestination().getAddress();
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java Tue May 22 21:34:43 2012
@@ -48,10 +48,15 @@ public class MultiplexClientServerTest e
static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
public static class Server extends AbstractBusTestServerBase {
-
+ Endpoint ep;
protected void run() {
- Object implementor = new NumberFactoryImpl();
- Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ setBus(BusFactory.getDefaultBus());
+ Object implementor = new NumberFactoryImpl(getBus());
+ ep = Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
}
public static void main(String[] args) {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java Tue May 22 21:34:43 2012
@@ -34,6 +34,7 @@ import javax.xml.ws.Endpoint;
import javax.xml.ws.Service;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.factory_pattern.IsEvenResponse;
import org.apache.cxf.factory_pattern.Number;
import org.apache.cxf.factory_pattern.NumberFactory;
@@ -54,10 +55,15 @@ public class MultiplexHttpAddressClientS
static final String FACTORY_ADDRESS = NumberFactoryImpl.FACTORY_ADDRESS;
public static class Server extends AbstractBusTestServerBase {
-
+ Endpoint ep;
protected void run() {
- Object implementor = new HttpNumberFactoryImpl();
- Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ setBus(BusFactory.getDefaultBus());
+ Object implementor = new HttpNumberFactoryImpl(getBus());
+ ep = Endpoint.publish(NumberFactoryImpl.FACTORY_ADDRESS, implementor);
+ }
+ public void tearDown() {
+ ep.stop();
+ ep = null;
}
public static void main(String[] args) {
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java Tue May 22 21:34:43 2012
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import org.apache.cxf.BusFactory;
+import org.apache.cxf.Bus;
import org.apache.cxf.factory_pattern.NumberFactory;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -55,8 +55,10 @@ public class NumberFactoryImpl implement
protected EndpointReferenceType templateEpr;
protected NumberImpl servant;
+ protected Bus bus;
- public NumberFactoryImpl() {
+ public NumberFactoryImpl(Bus b) {
+ bus = b;
}
public W3CEndpointReference create(String id) {
@@ -72,8 +74,7 @@ public class NumberFactoryImpl implement
}
EndpointReferenceType epr = EndpointReferenceUtils.getEndpointReferenceWithId(NUMBER_SERVICE_QNAME,
portName, id,
- BusFactory
- .getDefaultBus());
+ bus);
Source source = EndpointReferenceUtils.convertToXML(epr);
return new W3CEndpointReference(source);
}
@@ -91,15 +92,15 @@ public class NumberFactoryImpl implement
String wsdlLocation = "testutils/factory_pattern.wsdl";
String bindingId = null;
- EndpointImpl ep = new EndpointImpl(BusFactory.getDefaultBus(),
+ EndpointImpl ep = new EndpointImpl(bus,
servant, bindingId, wsdlLocation);
ep.setEndpointName(new QName(NUMBER_SERVICE_QNAME.getNamespaceURI(), "NumberPort"));
ep.publish(NUMBER_SERVANT_ADDRESS_ROOT);
templateEpr = ep.getServer().getDestination().getAddress();
// jms port
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(), wsdlLocation);
- ep = new EndpointImpl(BusFactory.getDefaultBus(), servant, bindingId, wsdlLocation);
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, wsdlLocation);
+ ep = new EndpointImpl(bus, servant, bindingId, wsdlLocation);
ep.setEndpointName(new QName(NUMBER_SERVICE_QNAME.getNamespaceURI(), "NumberPortJMS"));
ep.publish();
ep.getServer().getEndpoint().getInInterceptors().add(new LoggingInInterceptor());
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java Tue May 22 21:34:43 2012
@@ -46,7 +46,7 @@ public class IntFaultClientServerTest ex
"SOAPService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java Tue May 22 21:34:43 2012
@@ -71,7 +71,7 @@ public class OutBoundConnectionTest exte
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java Tue May 22 21:34:43 2012
@@ -42,7 +42,7 @@ public class JSClientServerTest extends
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java Tue May 22 21:34:43 2012
@@ -57,7 +57,7 @@ public class CallbackClientServerTest ex
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java Tue May 22 21:34:43 2012
@@ -39,7 +39,7 @@ public class JarResolverTest extends Abs
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java Tue May 22 21:34:43 2012
@@ -40,7 +40,7 @@ public class GreeterImpl implements Gree
*/
public String sayHi() {
LOG.info("Executing operation sayHi");
- System.out.println("Executing operation sayHi\n");
+ //System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
@@ -49,7 +49,7 @@ public class GreeterImpl implements Gree
faultDetail.setMajor((short)2);
faultDetail.setMinor((short)1);
LOG.info("Executing operation pingMe, throwing PingMeFault exception");
- System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
+ //System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java Tue May 22 21:34:43 2012
@@ -54,7 +54,7 @@ public class Soap12ClientServerTest exte
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl11.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl11.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl11.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl11.java Tue May 22 21:34:43 2012
@@ -50,12 +50,12 @@ public class GreeterImpl11 {
// throw the exception out with some cause
Exception cause = new IllegalArgumentException("Get a wrong name <sayHi>"
, new NullPointerException("Test cause."));
- cause.printStackTrace();
+ cause.fillInStackTrace();
throw new Fault("sayHiFault", LOG, cause);
}
public void greetMeOneWay(String requestType) {
- System.out.println("********* greetMeOneWay: " + requestType);
+ //System.out.println("********* greetMeOneWay: " + requestType);
}
public void pingMe() throws PingMeFault {
@@ -63,7 +63,7 @@ public class GreeterImpl11 {
faultDetail.setMajor((short)2);
faultDetail.setMinor((short)1);
LOG.info("Executing operation pingMe, throwing PingMeFault exception");
- System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
+ //System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java Tue May 22 21:34:43 2012
@@ -39,7 +39,7 @@ public class Soap11ClientServerTest exte
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server11.class, false));
+ launchServer(Server11.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap12ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap12ClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap12ClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap12ClientServerTest.java Tue May 22 21:34:43 2012
@@ -45,7 +45,7 @@ public class Soap12ClientServerTest exte
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server12.class));
+ assertTrue("server did not launch correctly", launchServer(Server12.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java Tue May 22 21:34:43 2012
@@ -37,7 +37,7 @@ public class StringArrayTest extends Abs
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@AfterClass
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTestImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTestImpl.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTestImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTestImpl.java Tue May 22 21:34:43 2012
@@ -23,9 +23,6 @@ import org.apache.stringarray.StringList
public class StringArrayTestImpl implements StringListTest {
public String[] stringListTest(String[] in) {
- for (String str : in) {
- System.out.println("--str-- " + str);
- }
return in;
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFindClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFindClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFindClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/AppleFindClientServerTest.java Tue May 22 21:34:43 2012
@@ -36,7 +36,7 @@ public class AppleFindClientServerTest e
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(AppleServer.class));
+ assertTrue("server did not launch correctly", launchServer(AppleServer.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java Tue May 22 21:34:43 2012
@@ -40,7 +40,7 @@ public class TypeSubClientServerTest ext
"CarDealerService");
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly", launchServer(Server.class));
+ assertTrue("server did not launch correctly", launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java Tue May 22 21:34:43 2012
@@ -50,7 +50,7 @@ public class SOAPDocLitClientTypeTest ex
@BeforeClass
public static void startServers() throws Exception {
- boolean ok = launchServer(SOAPDocLitServerImpl.class);
+ boolean ok = launchServer(SOAPDocLitServerImpl.class, true);
assertTrue("failed to launch server", ok);
initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java Tue May 22 21:34:43 2012
@@ -48,7 +48,7 @@ public class SOAPRpcLitClientTypeTest ex
@BeforeClass
public static void startServers() throws Exception {
- boolean ok = launchServer(SOAPRpcLitServerImpl.class);
+ boolean ok = launchServer(SOAPRpcLitServerImpl.class, true);
assertTrue("failed to launch server", ok);
initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
Modified: cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java?rev=1341645&r1=1341644&r2=1341645&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java Tue May 22 21:34:43 2012
@@ -37,7 +37,7 @@ public class XMLClientTypeTest extends A
@BeforeClass
public static void startServers() throws Exception {
- boolean ok = launchServer(XMLServerImpl.class);
+ boolean ok = launchServer(XMLServerImpl.class, true);
assertTrue("failed to launch server", ok);
initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
}