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 2010/08/12 22:11:11 UTC
svn commit: r984941 - in /cxf/branches/2.2.x-fixes: ./
systests/transports/src/test/java/org/apache/cxf/systest/jms/
systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/
systests/transports/src/test/java/org/apache/cxf/systest/jm...
Author: dkulp
Date: Thu Aug 12 20:11:10 2010
New Revision: 984941
URL: http://svn.apache.org/viewvc?rev=984941&view=rev
Log:
Merged revisions 984933,984938 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r984933 | dkulp | 2010-08-12 15:53:06 -0400 (Thu, 12 Aug 2010) | 2 lines
Hold onto defs strongly after modifying them to make sure changes stay
in memory (fixes some random test failures)
........
r984938 | dkulp | 2010-08-12 16:06:20 -0400 (Thu, 12 Aug 2010) | 2 lines
Last commit didn't actually work. Revert some of it and instead hold
onto the actual String key used to load the wsdl.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:984933-984938
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Thu Aug 12 20:11:10 2010
@@ -98,6 +98,9 @@ import org.springframework.jndi.JndiTemp
public class JMSClientServerTest extends AbstractBusClientServerTestBase {
static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
static final String PORT = Server.PORT;
+
+ private String wsdlString;
+
@BeforeClass
public static void startServers() throws Exception {
Map<String, String> props = new HashMap<String, String>();
@@ -117,7 +120,10 @@ public class JMSClientServerTest extends
public URL getWSDLURL(String s) throws Exception {
URL u = getClass().getResource(s);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), u.toString());
+ wsdlString = u.toString().intern();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
+ System.gc();
+ System.gc();
return u;
}
public QName getServiceName(QName q) {
@@ -357,8 +363,9 @@ public class JMSClientServerTest extends
ClassPathXmlApplicationContext ctx =
new ClassPathXmlApplicationContext(
new String[] {"/org/apache/cxf/systest/jms/JMSClients.xml"});
+ String wsdlString2 = "classpath:wsdl/jms_test.wsdl";
EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
- "classpath:wsdl/jms_test.wsdl");
+ wsdlString2);
HelloWorldPortType greeter = (HelloWorldPortType)ctx.getBean("jmsRPCClient");
assertNotNull(greeter);
@@ -439,8 +446,11 @@ public class JMSClientServerTest extends
"HelloWorldQueueDecoupledOneWaysPort"));
URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), "testutils/jms_test.wsdl");
+ String wsdlString2 = wsdl.toString();
+ String wsdlString3 = "testutils/jms_test.wsdl";
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString2);
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString3);
+
HelloWorldQueueDecoupledOneWaysService service =
new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java Thu Aug 12 20:11:10 2010
@@ -76,7 +76,8 @@ public class HelloWorldContinuationsThro
QName serviceName = new QName("http://cxf.apache.org/systest/jaxws", "HelloContinuationService");
URL wsdlURL = getClass().getResource("/org/apache/cxf/systest/jms/continuations/test2.wsdl");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlURL.toString());
+ String wsdlString = wsdlURL.toString().intern();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
HelloContinuationService service = new HelloContinuationService(wsdlURL, serviceName);
assertNotNull(service);
final HelloContinuation helloPort = service.getHelloContinuationPort();
Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java Thu Aug 12 20:11:10 2010
@@ -76,8 +76,8 @@ public class JMSContinuationsClientServe
QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", "HelloWorldPort"));
URL wsdl = getWSDLURL("/org/apache/cxf/systest/jms/continuations/jms_test.wsdl");
assertNotNull(wsdl);
-
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
HelloWorldService service = new HelloWorldService(wsdl, serviceName);
assertNotNull(service);
Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java Thu Aug 12 20:11:10 2010
@@ -79,8 +79,8 @@ public class JMSTransactionClientServerT
QName portName = getPortName(new QName("http://apache.org/hello_world_doc_lit", "SoapPort2"));
URL wsdl = getWSDLURL("/wsdl/hello_world_doc_lit.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
-
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
SOAPService2 service = new SOAPService2(wsdl, serviceName);
assertNotNull(service);
Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java Thu Aug 12 20:11:10 2010
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
+import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
@@ -49,12 +50,13 @@ public class MultiTransportClientServerT
"MultiTransportService");
public static class MyServer extends AbstractBusTestServerBase {
-
+ Definition def;
protected void run() {
Object implementor = new HTTPGreeterImpl();
String address = "http://localhost:" + PORT + "/SOAPDocLitService/SoapPort";
Endpoint.publish(address, implementor);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), "testutils/hello_world_doc_lit.wsdl");
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
+ "testutils/hello_world_doc_lit.wsdl");
implementor = new JMSGreeterImpl();
Endpoint.publish(null, implementor);
}
@@ -97,7 +99,8 @@ public class MultiTransportClientServerT
QName portName2 = new QName("http://apache.org/hello_world_doc_lit", "JMSPort");
URL wsdl = getClass().getResource("/wsdl/hello_world_doc_lit.wsdl");
assertNotNull(wsdl);
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
MultiTransportService service = new MultiTransportService(wsdl, serviceName);
assertNotNull(service);
Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=984941&r1=984940&r2=984941&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java Thu Aug 12 20:11:10 2010
@@ -118,8 +118,8 @@ public class MultiplexClientServerTest e
// verify it is JMS, 999 for JMS will throw a fault
W3CEndpointReference ref = factory.create("999");
- EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
- NumberService.WSDL_LOCATION.toString());
+ String s = NumberService.WSDL_LOCATION.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(), s);
NumberService numService = new NumberService();
assertNotNull("reference", ref);