Author: dkulp
Date: Mon Jul 6 20:14:39 2009
New Revision: 791602
URL: http://svn.apache.org/viewvc?rev=791602&view=rev
Log:
[CXF-2264] Some cleanup for wsdl extensor -> transport mapping things
Cleanup to make factory.setTransportId actually work
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
(with props)
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/Server.java
cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Mon Jul 6 20:14:39 2009
@@ -64,13 +64,20 @@
public SoapTransportFactory() {
super();
}
+
+ public String mapTransportURI(String s) {
+ if ("http://www.w3.org/2008/07/soap/bindings/JMS/".equals(s)) {
+ s = "http://cxf.apache.org/transports/jms";
+ }
+ return s;
+ }
public Destination getDestination(EndpointInfo ei) throws IOException {
SoapBindingInfo binding = (SoapBindingInfo)ei.getBinding();
DestinationFactory destinationFactory;
try {
destinationFactory =
bus.getExtension(DestinationFactoryManager.class)
- .getDestinationFactory(binding.getTransportURI());
+
.getDestinationFactory(mapTransportURI(binding.getTransportURI()));
return destinationFactory.getDestination(ei);
} catch (BusException e) {
throw new RuntimeException("Could not find destination factory for
transport "
@@ -113,6 +120,7 @@
SoapBindingInfo sbi = (SoapBindingInfo)b;
transportURI = sbi.getTransportURI();
}
+ EndpointInfo info = new SoapEndpointInfo(serviceInfo, transportURI);
if (port != null) {
List ees = port.getExtensibilityElements();
for (Iterator itr = ees.iterator(); itr.hasNext();) {
@@ -121,14 +129,14 @@
if (SOAPBindingUtil.isSOAPAddress(extensor)) {
final SoapAddress sa =
SOAPBindingUtil.getSoapAddress(extensor);
- EndpointInfo info = new SoapEndpointInfo(serviceInfo,
transportURI);
info.addExtensor(sa);
info.setAddress(sa.getLocationURI());
- return info;
+ } else {
+ info.addExtensor(extensor);
}
}
}
- return new SoapEndpointInfo(serviceInfo, transportURI);
+ return info;
}
@@ -141,7 +149,7 @@
ConduitInitiator conduitInit;
try {
conduitInit = bus.getExtension(ConduitInitiatorManager.class)
- .getConduitInitiator(binding.getTransportURI());
+
.getConduitInitiator(mapTransportURI(binding.getTransportURI()));
return conduitInit.getConduit(ei);
} catch (BusException e) {
Modified:
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
Mon Jul 6 20:14:39 2009
@@ -25,6 +25,7 @@
<namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
<namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
+ <namespace>http://www.w3.org/2008/07/soap/bindings/JMS/</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
</extension>
Modified:
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
Mon Jul 6 20:14:39 2009
@@ -31,8 +31,8 @@
<value>http://schemas.xmlsoap.org/soap/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
- <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
+ <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
</set>
</property>
<property name="bus" ref="cxf"/>
@@ -45,7 +45,8 @@
<list>
<value>http://schemas.xmlsoap.org/soap/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap/</value>
- <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
+ <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
+ <value>http://www.w3.org/2008/07/soap/bindings/JMS/</value>
</list>
</property>
<property name="bus" ref="cxf"/>
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
Mon Jul 6 20:14:39 2009
@@ -38,7 +38,12 @@
}
protected SoapBindingConfiguration createSoapBindingConfig() {
- return new
JaxWsSoapBindingConfiguration((JaxWsServiceFactoryBean)getServiceFactory());
+ JaxWsSoapBindingConfiguration bc
+ = new
JaxWsSoapBindingConfiguration((JaxWsServiceFactoryBean)getServiceFactory());
+ if (transportId != null) {
+ bc.setTransportURI(transportId);
+ }
+ return bc;
}
@Override
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
(original)
+++
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
Mon Jul 6 20:14:39 2009
@@ -150,8 +150,12 @@
if (jaxBid.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING)) {
conf.setMtomEnabled(true);
}
-
+
+ if (transportId != null) {
+ conf.setTransportURI(transportId);
+ }
conf.setJaxWsServiceFactoryBean(sf);
+
}
BindingInfo bindingInfo = super.createBindingInfo();
Modified:
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
(original)
+++
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
Mon Jul 6 20:14:39 2009
@@ -233,7 +233,8 @@
protected EndpointInfo createEndpointInfo() throws BusException {
if (transportId == null
- && getAddress() != null) {
+ && getAddress() != null
+ && getAddress().contains("://")) {
DestinationFactory df = getDestinationFactory();
if (df == null) {
DestinationFactoryManager dfm =
getBus().getExtension(DestinationFactoryManager.class);
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Mon Jul 6 20:14:39 2009
@@ -260,8 +260,12 @@
JMSEndpoint endpoint = null;
try {
endpoint =
JMSEndpointParser.createEndpoint(endpointInfo.getAddress());
+ } catch (RuntimeException ex) {
+ throw ex;
} catch (Exception e) {
- throw new IOException(e.getMessage());
+ IOException e2 = new IOException(e.getMessage(), e);
+ e2.initCause(e);
+ throw e2;
}
retrieveWSDLInformation(endpoint, endpointInfo);
//address = endpointInfo.getTraversedExtensor(new AddressType(),
AddressType.class);
Modified:
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
(original)
+++
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
Mon Jul 6 20:14:39 2009
@@ -20,7 +20,6 @@
<extensions xmlns="http://cxf.apache.org/bus/extension">
<extension class="org.apache.cxf.transport.jms.JMSTransportFactory"
deferred="true">
- <namespace>http://www.w3.org/2008/07/soap/bindings/JMS/</namespace>
<namespace>http://cxf.apache.org/transports/jms</namespace>
<namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
</extension>
Modified:
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
(original)
+++
cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf-extension-jms.xml
Mon Jul 6 20:14:39 2009
@@ -29,7 +29,6 @@
<property name="bus" ref="cxf"/>
<property name="transportIds">
<list>
- <value>http://www.w3.org/2008/07/soap/bindings/JMS/</value>
<value>http://cxf.apache.org/transports/jms</value>
<value>http://cxf.apache.org/transports/jms/configuration</value>
</list>
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
Mon Jul 6 20:14:39 2009
@@ -47,7 +47,7 @@
@BeforeClass
public static void startServers() throws Exception {
- assertTrue("server did not launch correctly",
launchServer(AegisServer.class, false));
+ assertTrue("server did not launch correctly",
launchServer(AegisServer.class, true));
}
@Test
Added:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java?rev=791602&view=auto
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
(added)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
Mon Jul 6 20:14:39 2009
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jms;
+
+import org.apache.cxf.jms_greeter.JMSGreeterPortType;
+
[email protected](portName = "GreeterPort2",
+ serviceName = "JMSGreeterService2",
+ targetNamespace = "http://cxf.apache.org/jms_greeter",
+ endpointInterface =
"org.apache.cxf.jms_greeter.JMSGreeterPortType",
+ wsdlLocation = "testutils/jms_spec_test.wsdl")
+public class GreeterSpecWithPortError implements JMSGreeterPortType {
+
+ public String greetMe(String me) {
+ System.out.println("Executing operation greetMe");
+ System.out.println("Message received: " + me + "\n");
+ return "Hello " + me;
+ }
+
+ public String sayHi() {
+ System.out.println("Executing operation sayHi" + "\n");
+ return "Bonjour";
+ }
+
+ public void greetMeOneWay(String me) {
+ System.out.println("Executing operation greetMeOneWay\n");
+ System.out.println("Hello there " + me);
+ }
+}
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/GreeterSpecWithPortError.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
---
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
(original)
+++
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
Mon Jul 6 20:14:39 2009
@@ -862,8 +862,8 @@
@Test
public void testWsdlExtensionSpecJMSPortError() throws Exception {
QName serviceName = getServiceName(new
QName("http://cxf.apache.org/jms_greeter",
- "JMSGreeterService2"));
-
+ "JMSGreeterService2"));
+ QName portName = getPortName(new
QName("http://cxf.apache.org/jms_greeter", "GreeterPort2"));
URL wsdl = getWSDLURL("/wsdl/jms_spec_test.wsdl");
assertNotNull(wsdl);
@@ -871,12 +871,10 @@
assertNotNull(service);
String response = new String("Bonjour");
-
- JMSGreeterPortType greeter = service.getGreeterPort2();
+ JMSGreeterPortType greeter = service.getPort(portName,
JMSGreeterPortType.class);
String reply = greeter.sayHi();
assertNotNull("no response received from service", reply);
- assertEquals(response, reply);
-
+ assertEquals(response, reply);
}
@Test
Modified:
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/Server.java?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
--- cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/Server.java
(original)
+++ cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/Server.java Mon
Jul 6 20:14:39 2009
@@ -73,11 +73,12 @@
+
"&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
Endpoint.publish(address1, spec1);
+ Object spec2 = new GreeterSpecWithPortError();
String address2 = "jms:jndi:dynamicQueues/test.cxf.jmstransport.queue5"
+ "?jndiInitialContextFactory"
+ "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
+
"&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
- Endpoint.publish(address2, spec1);
+ Endpoint.publish(address2, spec2);
initNoWsdlServer();
}
Modified: cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl?rev=791602&r1=791601&r2=791602&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl (original)
+++ cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl Mon Jul 6
20:14:39 2009
@@ -20,16 +20,16 @@
under the License.
-->
<wsdl:definitions name="JMSGreeterService"
- targetNamespace="http://cxf.apache.org/jms_greeter"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ targetNamespace="http://cxf.apache.org/jms_greeter"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://cxf.apache.org/jms_greeter"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:x1="http://cxf.apache.org/jms_greeter/types"
xmlns:soapjms="http://www.w3.org/2008/07/soap/bindings/JMS/">
<wsdl:types>
- <schema targetNamespace="http://cxf.apache.org/jms_greeter/types"
+ <schema targetNamespace="http://cxf.apache.org/jms_greeter/types"
xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
<element name="sayHi">
<complexType/>
@@ -66,6 +66,7 @@
</wsdl:types>
+
<wsdl:message name="sayHiRequest">
<wsdl:part element="x1:sayHi" name="in"/>
</wsdl:message>
@@ -82,40 +83,46 @@
<wsdl:part element="x1:greetMeOneWay" name="in"/>
</wsdl:message>
+
<wsdl:portType name="JMSGreeterPortType">
<wsdl:operation name="sayHi">
<wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
<wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
</wsdl:operation>
+
<wsdl:operation name="greetMe">
<wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
<wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
</wsdl:operation>
+
<wsdl:operation name="greetMeOneWay">
<wsdl:input message="tns:greetMeOneWayRequest"
name="greetMeOneWayRequest"/>
</wsdl:operation>
</wsdl:portType>
+
<wsdl:binding name="JMSGreeterPortBinding" type="tns:JMSGreeterPortType">
<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+
<soapjms:jndiContextParameter name="name"
- value="value" />
- <soapjms:jndiConnectionFactoryName>ConnectionFactory
- </soapjms:jndiConnectionFactoryName>
- <soapjms:jndiInitialContextFactory>
+ value="value" />
+ <soapjms:jndiConnectionFactoryName>ConnectionFactory
+ </soapjms:jndiConnectionFactoryName>
+ <soapjms:jndiInitialContextFactory>
org.apache.activemq.jndi.ActiveMQInitialContextFactory
- </soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>tcp://localhost:61500
- </soapjms:jndiURL>
- <soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
- <soapjms:priority>5</soapjms:priority>
- <soapjms:timeToLive>1000</soapjms:timeToLive>
- <!-- <soapjms:replyToName>replytoname</soapjms:replyToName> -->
+ </soapjms:jndiInitialContextFactory>
+ <soapjms:jndiURL>tcp://localhost:61500
+ </soapjms:jndiURL>
+ <soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
+ <soapjms:priority>5</soapjms:priority>
+ <soapjms:timeToLive>1000</soapjms:timeToLive>
+ <!-- <soapjms:replyToName>replytoname</soapjms:replyToName> -->
+
<wsdl:operation name="greetMe">
<soap:operation soapAction="test" style="document"/>
<wsdl:input name="greetMeRequest">
@@ -126,6 +133,7 @@
</wsdl:output>
</wsdl:operation>
+
<wsdl:operation name="sayHi">
<soap:operation soapAction="test" style="document"/>
<wsdl:input name="sayHiRequest">
@@ -136,6 +144,7 @@
</wsdl:output>
</wsdl:operation>
+
<wsdl:operation name="greetMeOneWay">
<soap:operation soapaction="test" style="document"/>
<wsdl:input name="greetMeOneWayRequest">
@@ -144,75 +153,57 @@
</wsdl:operation>
</wsdl:binding>
+
<wsdl:service name="JMSGreeterService">
- <soapjms:jndiContextParameter name="name2"
- value="value2" />
- <soapjms:jndiConnectionFactoryName>ConnectionFactory
- </soapjms:jndiConnectionFactoryName>
- <soapjms:jndiInitialContextFactory>
- org.apache.activemq.jndi.ActiveMQInitialContextFactory
- </soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>tcp://localhost:61500
- </soapjms:jndiURL>
- <soapjms:deliveryMode>NON_PERSISTENT
- </soapjms:deliveryMode>
- <soapjms:priority>6</soapjms:priority>
- <soapjms:timeToLive>2000</soapjms:timeToLive>
- <!--<soapjms:replyToName>replytoname2</soapjms:replyToName>-->
+ <soapjms:jndiContextParameter name="name2" value="value2" />
+
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
+
<soapjms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</soapjms:jndiInitialContextFactory>
+ <soapjms:jndiURL>tcp://localhost:61500
+ </soapjms:jndiURL>
+ <soapjms:deliveryMode>NON_PERSISTENT
+ </soapjms:deliveryMode>
+ <soapjms:priority>6</soapjms:priority>
+ <soapjms:timeToLive>2000</soapjms:timeToLive>
+ <!--<soapjms:replyToName>replytoname2</soapjms:replyToName>-->
<wsdl:port binding="tns:JMSGreeterPortBinding" name="GreeterPort">
<soap:address
location="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue2?jndiInitialContextFactory=org.apache.activemq.jndi.ActiveMQInitialContextFactory&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500"/>
- <soapjms:jndiContextParameter name="name3"
- value="value3" />
- <soapjms:jndiConnectionFactoryName>ConnectionFactory
- </soapjms:jndiConnectionFactoryName>
- <soapjms:jndiInitialContextFactory>
-
org.apache.activemq.jndi.ActiveMQInitialContextFactory
- </soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>tcp://localhost:61500
- </soapjms:jndiURL>
- <soapjms:deliveryMode>PERSISTENT
- </soapjms:deliveryMode>
- <soapjms:priority>7</soapjms:priority>
- <soapjms:timeToLive>3000</soapjms:timeToLive>
- <!--
- <soapjms:replyToName>replytoname3</soapjms:replyToName>
- -->
+ <soapjms:jndiContextParameter name="name3" value="value3" />
+
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
+
<soapjms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</soapjms:jndiInitialContextFactory>
+ <soapjms:jndiURL>tcp://localhost:61500</soapjms:jndiURL>
+ <soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
+ <soapjms:priority>7</soapjms:priority>
+ <soapjms:timeToLive>3000</soapjms:timeToLive>
+ <!--
+ <soapjms:replyToName>replytoname3</soapjms:replyToName>
+ -->
</wsdl:port>
</wsdl:service>
+
<wsdl:service name="JMSGreeterService2">
- <soapjms:jndiContextParameter name="name2"
- value="value2" />
- <soapjms:jndiConnectionFactoryName>ConnectionFactory
- </soapjms:jndiConnectionFactoryName>
- <soapjms:jndiInitialContextFactory>
- org.apache.activemq.jndi.ActiveMQInitialContextFactory
- </soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>tcp://localhost:61500
- </soapjms:jndiURL>
- <soapjms:deliveryMode>NON_PERSISTENT
- </soapjms:deliveryMode>
- <soapjms:priority>6</soapjms:priority>
- <soapjms:timeToLive>2000</soapjms:timeToLive>
- <!--<soapjms:replyToName>replytoname2</soapjms:replyToName>-->
+ <soapjms:jndiContextParameter name="name2" value="value2" />
+
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
+
<soapjms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</soapjms:jndiInitialContextFactory>
+ <soapjms:jndiURL>tcp://localhost:61500
+ </soapjms:jndiURL>
+ <soapjms:deliveryMode>NON_PERSISTENT
+ </soapjms:deliveryMode>
+ <soapjms:priority>6</soapjms:priority>
+ <soapjms:timeToLive>2000</soapjms:timeToLive>
+ <!--<soapjms:replyToName>replytoname2</soapjms:replyToName>-->
<wsdl:port binding="tns:JMSGreeterPortBinding" name="GreeterPort2">
- <soap:address
location="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue5"/>
- <!--soapjms:jndiConnectionFactoryName>ConnectionFactory
- </soapjms:jndiConnectionFactoryName>
- <soapjms:jndiContextParameter name="name3"
- value="value3" />
- <soapjms:jndiInitialContextFactory>
-
org.apache.activemq.jndi.ActiveMQInitialContextFactory
- </soapjms:jndiInitialContextFactory>
- <soapjms:jndiURL>tcp://localhost:61500
- </soapjms:jndiURL>
- <soapjms:deliveryMode>PERSISTENT
- </soapjms:deliveryMode>
- <soapjms:priority>7</soapjms:priority>
- <soapjms:timeToLive>3000</soapjms:timeToLive-->
- <!--
- <soapjms:replyToName>replytoname3</soapjms:replyToName>
- -->
+
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
+ <soap:address
location="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue5?jndiInitialContextFactory=org.apache.activemq.jndi.ActiveMQInitialContextFactory&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500"/>
+ <soapjms:jndiContextParameter name="name3" value="value3" />
+
<soapjms:jndiInitialContextFactory>org.apache.activemq.jndi.ActiveMQInitialContextFactory</soapjms:jndiInitialContextFactory>
+ <soapjms:jndiURL>tcp://localhost:61500</soapjms:jndiURL>
+ <soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
+ <soapjms:priority>7</soapjms:priority>
+ <soapjms:timeToLive>3000</soapjms:timeToLive>
+ <!--
+ <soapjms:replyToName>replytoname3</soapjms:replyToName>
+ -->
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file