Author: dkulp
Date: Thu Aug 12 20:06:20 2010
New Revision: 984938
URL: http://svn.apache.org/viewvc?rev=984938&view=rev
Log:
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/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/AbstractSOAPJMSTestSuite.java
Thu Aug 12 20:06:20 2010
@@ -26,7 +26,6 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
@@ -61,8 +60,8 @@ public abstract class AbstractSOAPJMSTes
QName qServiceName = new QName(namespace, serviceName);
QName qPortName = new QName(namespace, portName);
URL wsdl = getClass().getResource("/wsdl/jms_spec_testsuite.wsdl");
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- assertNotNull(def);
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
BusFactory.setThreadDefaultBus(getBus());
BusFactory.setDefaultBus(getBus());
Class<? extends Service> svcls =
serviceClass.asSubclass(Service.class);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Thu Aug 12 20:06:20 2010
@@ -34,7 +34,6 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Binding;
@@ -105,7 +104,7 @@ public class JMSClientServerTest extends
static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
static final String PORT = Server.PORT;
- private Definition definition;
+ private String wsdlString;
@BeforeClass
public static void startServers() throws Exception {
@@ -126,8 +125,10 @@ public class JMSClientServerTest extends
public URL getWSDLURL(String s) throws Exception {
URL u = getClass().getResource(s);
- definition = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
u.toString());
- assertNotNull(definition);
+ wsdlString = u.toString().intern();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
+ System.gc();
+ System.gc();
return u;
}
public QName getServiceName(QName q) {
@@ -476,9 +477,9 @@ public class JMSClientServerTest extends
ClassPathXmlApplicationContext ctx =
new ClassPathXmlApplicationContext(
new String[] {"/org/apache/cxf/systest/jms/JMSClients.xml"});
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
-
"classpath:wsdl/jms_test.wsdl");
- assertNotNull(def);
+ String wsdlString2 = "classpath:wsdl/jms_test.wsdl";
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
+ wsdlString2);
HelloWorldPortType greeter =
(HelloWorldPortType)ctx.getBean("jmsRPCClient");
assertNotNull(greeter);
@@ -559,10 +560,10 @@ public class JMSClientServerTest extends
"HelloWorldQueueDecoupledOneWaysPort"));
URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
assertNotNull(wsdl);
- Definition def1 =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- Definition def2 =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
- assertNotNull(def1);
- assertNotNull(def2);
+ String wsdlString2 = wsdl.toString();
+ String wsdlString3 = "testutils/jms_test.wsdl";
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString2);
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString3);
HelloWorldQueueDecoupledOneWaysService service =
@@ -632,8 +633,8 @@ public class JMSClientServerTest extends
"HelloWorldQueueDecoupledOneWaysPort"));
URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
assertNotNull(wsdl);
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(),
"testutils/jms_test.wsdl");
- assertNotNull(def);
+ String wsdlString2 = "testutils/jms_test.wsdl";
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString2);
HelloWorldQueueDecoupledOneWaysService service =
new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
Thu Aug 12 20:06:20 2010
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jms;
-import javax.wsdl.Definition;
import javax.xml.ws.Binding;
import javax.xml.ws.Endpoint;
import javax.xml.ws.soap.SOAPBinding;
@@ -33,9 +32,6 @@ import org.apache.cxf.transport.jms.spec
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
- Definition def1;
- Definition def2;
- Definition def3;
protected void run() {
Object implementor = new GreeterImplTwoWayJMS();
@@ -57,9 +53,10 @@ public class Server extends AbstractBusT
Object mtom = new JMSMTOMImpl();
Bus bus = BusFactory.getDefaultBus();
- def1 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/hello_world_doc_lit.wsdl");
- def2 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test.wsdl");
- def3 = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test_mtom.wsdl");
+
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/hello_world_doc_lit.wsdl");
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test.wsdl");
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"testutils/jms_test_mtom.wsdl");
Endpoint.publish(null, impleDoc);
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
Thu Aug 12 20:06:20 2010
@@ -26,7 +26,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
@@ -77,8 +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");
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlURL.toString());
- assertNotNull(def);
+ String wsdlString = wsdlURL.toString().intern();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
HelloContinuationService service = new
HelloContinuationService(wsdlURL, serviceName);
assertNotNull(service);
final HelloContinuation helloPort = service.getHelloContinuationPort();
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
Thu Aug 12 20:06:20 2010
@@ -22,7 +22,6 @@ import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.hello_world_jms.HelloWorldPortType;
@@ -77,9 +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);
-
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- assertNotNull(def);
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
HelloWorldService service = new HelloWorldService(wsdl, serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
Thu Aug 12 20:06:20 2010
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jms.continuations;
-import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
@@ -27,10 +26,9 @@ import org.apache.cxf.testutil.common.Em
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
- Definition def;
protected void run() {
- def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
"testutils/jms_test.wsdl");
Object implementor = new GreeterImplWithContinuationsJMS();
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
Thu Aug 12 20:06:20 2010
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jms.continuations;
-import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.BusFactory;
@@ -27,11 +26,9 @@ import org.apache.cxf.testutil.common.Em
public class Server2 extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server2.class);
- Definition def;
-
protected void run() {
- def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
"org/apache/cxf/systest/jms/continuations/test.wsdl");
Object implementor = new HelloWorldWithContinuationsJMS();
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
Thu Aug 12 20:06:20 2010
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.systest.jms.continuations;
-import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
@@ -33,13 +32,11 @@ public class Server3 extends AbstractBus
private static final String CONFIG_FILE =
"org/apache/cxf/systest/jms/continuations/jms_test_config.xml";
- Definition def;
-
protected void run() {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus(CONFIG_FILE);
BusFactory.setDefaultBus(bus);
- def = EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus,
"org/apache/cxf/systest/jms/continuations/test2.wsdl");
Object implementor = new HelloWorldWithContinuationsJMS2();
String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/jms/tx/JMSTransactionClientServerTest.java
Thu Aug 12 20:06:20 2010
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.Map;
import javax.jms.ConnectionFactory;
-import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
@@ -80,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);
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- assertNotNull(def);
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
SOAPService2 service = new SOAPService2(wsdl, serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/multitransport/MultiTransportClientServerTest.java
Thu Aug 12 20:06:20 2010
@@ -55,8 +55,8 @@ public class MultiTransportClientServerT
Object implementor = new HTTPGreeterImpl();
String address = "http://localhost:" + PORT +
"/SOAPDocLitService/SoapPort";
Endpoint.publish(address, implementor);
- def = 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);
}
@@ -99,8 +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);
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
- assertNotNull(def);
+ String wsdlString = wsdl.toString();
+ EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlString);
MultiTransportService service = new MultiTransportService(wsdl,
serviceName);
assertNotNull(service);
Modified:
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
(original)
+++
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexClientServerTest.java
Thu Aug 12 20:06:20 2010
@@ -23,7 +23,6 @@ package org.apache.cxf.systest.factory_p
import java.util.HashMap;
import java.util.Map;
-import javax.wsdl.Definition;
import javax.xml.ws.Endpoint;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
@@ -119,10 +118,8 @@ public class MultiplexClientServerTest e
// verify it is JMS, 999 for JMS will throw a fault
W3CEndpointReference ref = factory.create("999");
- Definition def =
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
-
NumberService.WSDL_LOCATION
-
.toString());
- assertNotNull(def);
+ String s = NumberService.WSDL_LOCATION.toString();
+
EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(), s);
NumberService numService = new NumberService();
assertNotNull("reference", ref);
Modified:
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java?rev=984938&r1=984937&r2=984938&view=diff
==============================================================================
---
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
(original)
+++
cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/EmbeddedJMSBrokerLauncher.java
Thu Aug 12 20:06:20 2010
@@ -41,7 +41,7 @@ public class EmbeddedJMSBrokerLauncher e
final String brokerUrl1 = "tcp://localhost:" + PORT;
- public static Definition updateWsdlExtensors(Bus bus, String wsdlLocation)
{
+ public static void updateWsdlExtensors(Bus bus, String wsdlLocation) {
try {
if (bus == null) {
bus = BusFactory.getThreadDefaultBus();
@@ -87,11 +87,9 @@ public class EmbeddedJMSBrokerLauncher e
}
}
}
- return def;
} catch (Exception e) {
e.printStackTrace();
}
- return null;
}
public void tearDown() throws Exception {