Author: ningjiang
Date: Wed Aug 18 05:53:13 2010
New Revision: 986571
URL: http://svn.apache.org/viewvc?rev=986571&view=rev
Log:
CXF-2949, CXF-2950, CXF-2951, applied Peter's patch of soapjms
Modified:
cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/wsdl/jms_greeter.wsdl
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.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/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/testcases.xml
cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_test.wsdl
cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl
Modified:
cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/wsdl/jms_greeter.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/wsdl/jms_greeter.wsdl?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/wsdl/jms_greeter.wsdl
(original)
+++
cxf/trunk/distribution/src/main/release/samples/jms-spec-demo/wsdl/jms_greeter.wsdl
Wed Aug 18 05:53:13 2010
@@ -19,7 +19,7 @@
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:x1="http://cxf.apache.org/jms_greeter/types";
xmlns:soapjms="http://www.w3.org/2008/07/soap/bindings/JMS/";>
+ xmlns:x1="http://cxf.apache.org/jms_greeter/types";
xmlns:soapjms="http://www.w3.org/2010/soapjms/";>
<wsdl:types>
<schema
targetNamespace="http://cxf.apache.org/jms_greeter/types";
xmlns="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
@@ -93,7 +93,7 @@
<wsdl:binding name="JMSGreeterPortBinding"
type="tns:JMSGreeterPortType">
<soap:binding style="document"
- transport="http://www.w3.org/2008/07/soap/bindings/JMS/";
/>
+ transport="http://www.w3.org/2010/soapjms/"; />
<soapjms:jndiConnectionFactoryName>ConnectionFactory</soapjms:jndiConnectionFactoryName>
<soapjms:jndiInitialContextFactory>
org.apache.activemq.jndi.ActiveMQInitialContextFactory
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
Wed Aug 18 05:53:13 2010
@@ -146,8 +146,8 @@ public class SoapBindingFactory extends
info.setName(config.getBindingName(si));
info.setStyle(config.getStyle());
if
("http://cxf.apache.org/transports/jms".equals(config.getTransportURI())) {
-
info.setTransportURI("http://www.w3.org/2008/07/soap/bindings/JMS/";);
-
config.setTransportURI("http://www.w3.org/2008/07/soap/bindings/JMS/";);
+ info.setTransportURI("http://www.w3.org/2010/soapjms/";);
+ config.setTransportURI("http://www.w3.org/2010/soapjms/";);
} else {
info.setTransportURI(config.getTransportURI());
}
@@ -380,7 +380,7 @@ public class SoapBindingFactory extends
}
//jms
- if
(sbi.getTransportURI().equals("http://www.w3.org/2008/07/soap/bindings/JMS/";)) {
+ if
(sbi.getTransportURI().equals("http://www.w3.org/2010/soapjms/";)) {
sb.getInInterceptors().add(new SoapJMSInInterceptor());
}
} else {
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=986571&r1=986570&r2=986571&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
Wed Aug 18 05:53:13 2010
@@ -77,7 +77,7 @@ public class SoapTransportFactory extend
return Collections.singleton("soap.tcp");
}
public String mapTransportURI(String s, String address) {
- if ("http://www.w3.org/2008/07/soap/bindings/JMS/".equals(s)
+ if ("http://www.w3.org/2010/soapjms/".equals(s)
|| (address != null&& address.startsWith("jms"))) {
s = "http://cxf.apache.org/transports/jms";;
} else if (SOAP_11_HTTP_BINDING.equals(s)
@@ -173,7 +173,7 @@ public class SoapTransportFactory extend
info.addExtensor(sa);
info.setAddress(sa.getLocationURI());
if (isJMSSpecAddress(sa.getLocationURI())) {
-
info.setTransportId("http://www.w3.org/2008/07/soap/bindings/JMS/";);
+ info.setTransportId("http://www.w3.org/2010/soapjms/";);
}
} else {
info.addExtensor(extensor);
Modified:
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
Wed Aug 18 05:53:13 2010
@@ -19,9 +19,6 @@
package org.apache.cxf.binding.soap.jms.interceptor;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import javax.xml.namespace.QName;
import org.w3c.dom.Document;
@@ -32,16 +29,12 @@ import org.apache.cxf.binding.soap.Soap1
import org.apache.cxf.binding.soap.SoapBinding;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapVersion;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.interceptor.Fault;
/**
*
*/
public class SoapFaultFactory {
-
- private static final Logger LOG =
LogUtils.getL7dLogger(SoapFaultFactory.class);
private SoapVersion version;
@@ -63,20 +56,7 @@ public class SoapFaultFactory {
Fault createSoap11Fault(JMSFault jmsFault) {
SoapFault fault = new SoapFault(jmsFault.getReason(),
- jmsFault.isSender() ? version.getSender() : version.getReceiver());
- QName subCode = jmsFault.getSubCode();
- fault.setSubCode(subCode);
- try {
- Document doc = XMLUtils.newDocument();
- Element detail = doc.createElementNS(Soap11.SOAP_NAMESPACE,
"detail");
- Element detailChild =
doc.createElementNS(subCode.getNamespaceURI(), subCode.getLocalPart());
- detailChild.setTextContent(fault.getReason());
- detail.appendChild(detailChild);
- fault.setDetail(detail);
- } catch (Exception ex) {
- LogUtils.log(LOG, Level.SEVERE, "MARSHAL_FAULT_DETAIL_EXC", ex);
- ex.printStackTrace();
- }
+ jmsFault.getSubCode());
return fault;
}
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=986571&r1=986570&r2=986571&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
Wed Aug 18 05:53:13 2010
@@ -25,7 +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://www.w3.org/2010/soapjms/</namespace>
<namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
<namespace>http://schemas.xmlsoap.org/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=986571&r1=986570&r2=986571&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
Wed Aug 18 05:53:13 2010
@@ -39,7 +39,7 @@ http://www.springframework.org/schema/be
<value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
<value>http://schemas.xmlsoap.org/soap/http/</value>
<value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
-<value>http://www.w3.org/2008/07/soap/bindings/JMS/</value>
+<value>http://www.w3.org/2010/soapjms/</value>
<value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
<value>http://schemas.xmlsoap.org/soap/http</value>
</list>
Modified:
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
(original)
+++
cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
Wed Aug 18 05:53:13 2010
@@ -45,10 +45,12 @@ public class SoapFaultFactoryTest extend
control = EasyMock.createNiceControl();
}
- JMSFault setupJMSFault(boolean isSender, QName code, Object detail) {
+ JMSFault setupJMSFault(boolean isSender, QName code, Object detail,
boolean isSoap12) {
jmsFault = control.createMock(JMSFault.class);
EasyMock.expect(jmsFault.getReason()).andReturn("reason");
- EasyMock.expect(jmsFault.isSender()).andReturn(isSender);
+ if (isSoap12) {
+ EasyMock.expect(jmsFault.isSender()).andReturn(isSender);
+ }
EasyMock.expect(jmsFault.getSubCode()).andReturn(code);
if (null != detail) {
EasyMock.expect(jmsFault.getDetail()).andReturn(detail);
@@ -62,14 +64,14 @@ public class SoapFaultFactoryTest extend
public void createSoap11Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
EasyMock.expect(sb.getSoapVersion()).andReturn(Soap11.getInstance());
- setupJMSFault(true, SoapJMSConstants.getContentTypeMismatchQName(),
null);
+ setupJMSFault(true, SoapJMSConstants.getContentTypeMismatchQName(),
null, false);
control.replay();
+
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
assertEquals("reason", fault.getReason());
- assertEquals(Soap11.getInstance().getSender(), fault.getFaultCode());
- assertEquals(SoapJMSConstants.getContentTypeMismatchQName(),
fault.getSubCode());
- assertNotNull(fault.getDetail());
+ assertEquals(SoapJMSConstants.getContentTypeMismatchQName(),
fault.getFaultCode());
+ assertNull(fault.getDetail());
assertSame(jmsFault, fault.getCause());
control.verify();
}
@@ -78,7 +80,7 @@ public class SoapFaultFactoryTest extend
public void createSoap12Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
EasyMock.expect(sb.getSoapVersion()).andReturn(Soap12.getInstance());
- setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(),
null);
+ setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(),
null, true);
control.replay();
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/spec/JMSSpecConstants.java
Wed Aug 18 05:53:13 2010
@@ -26,7 +26,7 @@ package org.apache.cxf.transport.jms.spe
public final class JMSSpecConstants {
public static final String SOAP_JMS_SPECIFICIATION_TRANSPORTID
- = "http://www.w3.org/2008/07/soap/bindings/JMS/";;
+ = "http://www.w3.org/2010/soapjms/";;
public static final String SOAP_JMS_NAMESPACE =
SOAP_JMS_SPECIFICIATION_TRANSPORTID;
public static final String SOAP_JMS_PREFIX = "SOAPJMS_";
Modified:
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
(original)
+++
cxf/trunk/rt/transports/jms/src/main/resources/schemas/wsdl/spec/jms-spec-wsdl.xsd
Wed Aug 18 05:53:13 2010
@@ -15,9 +15,9 @@
License.
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:soapjms="http://www.w3.org/2008/07/soap/bindings/JMS/";
+ xmlns:soapjms="http://www.w3.org/2010/soapjms/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
- targetNamespace="http://www.w3.org/2008/07/soap/bindings/JMS/";
+ targetNamespace="http://www.w3.org/2010/soapjms/";
elementFormDefault="qualified" jaxb:version="2.0">
<xs:element name="jndiContextParameter"
type="soapjms:jndiContextParameterType" />
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/testcases/SOAPJMSTestSuiteTest.java
Wed Aug 18 05:53:13 2010
@@ -155,7 +155,10 @@ public class SOAPJMSTestSuiteTest extend
final JMSSimplePortType simplePort = getPort("JMSSimpleService0001",
"SimplePort",
JMSSimpleService0001.class,
JMSSimplePortType.class);
- twoWayTest(testcase, simplePort);
+ JMSMessageHeadersType requestHeader = new JMSMessageHeadersType();
+ requestHeader.setJMSCorrelationID("Correlator0002");
+
+ twoWayTestWithRequestHeader(testcase, simplePort, requestHeader);
}
@Test
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/JMSTestUtil.java
Wed Aug 18 05:53:13 2010
@@ -205,6 +205,9 @@ public final class JMSTestUtil {
if (messageProperties.isSetExpiration()) {
jmsMessage.setJMSPriority(messageProperties.getExpiration());
}
+ if (messageProperties.isSetCorrelationID()) {
+
jmsMessage.setJMSCorrelationID(messageProperties.getCorrelationID());
+ }
if (messageProperties.isSetTargetService()
&& !"".equals(messageProperties.getTargetService().trim())) {
Modified:
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/testcases.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/testcases.xml?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
---
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/testcases.xml
(original)
+++
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/jms/testsuite/util/testcases.xml
Wed Aug 18 05:53:13 2010
@@ -45,7 +45,7 @@
<priority>4</priority>
<expiration>0</expiration>
<replyTo></replyTo>
-<correlationID></correlationID>
+<correlationID>Correlator0002</correlationID>
<destination>queue://testqueue0001</destination>
<redelivered>false</redelivered>
<bindingVersion>1.0</bindingVersion>
@@ -62,7 +62,7 @@
<priority>4</priority>
<expiration>0</expiration>
<replyTo></replyTo>
-<correlationID></correlationID>
+<correlationID>Correlator0002</correlationID>
<destination></destination>
<redelivered>false</redelivered>
<bindingVersion>1.0</bindingVersion>
@@ -103,7 +103,7 @@
<priority>4</priority>
<expiration>0</expiration>
<replyTo></replyTo>
-<correlationID></correlationID>
+<correlationID>Correlator0002</correlationID>
<destination>queue://testqueue0101</destination>
<redelivered>false</redelivered>
<bindingVersion>1.0</bindingVersion>
@@ -120,7 +120,7 @@
<priority>4</priority>
<expiration>0</expiration>
<replyTo></replyTo>
-<correlationID></correlationID>
+<correlationID>Correlator0002</correlationID>
<destination></destination>
<redelivered>false</redelivered>
<bindingVersion>1.0</bindingVersion>
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=986571&r1=986570&r2=986571&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 Wed Aug 18
05:53:13 2010
@@ -27,7 +27,7 @@
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/";>
+ xmlns:soapjms="http://www.w3.org/2010/soapjms/";>
<wsdl:types>
<schema targetNamespace="http://cxf.apache.org/jms_greeter/types";
xmlns="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
@@ -105,7 +105,7 @@
<wsdl:binding name="JMSGreeterPortBinding" type="tns:JMSGreeterPortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:jndiContextParameter name="name"
Modified: cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl
URL:
http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl?rev=986571&r1=986570&r2=986571&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl
(original)
+++ cxf/trunk/testutils/src/main/resources/wsdl/jms_spec_testsuite.wsdl Wed Aug
18 05:53:13 2010
@@ -29,7 +29,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:x1="http://cxf.apache.org/jms_simple/types";
- xmlns:soapjms="http://www.w3.org/2008/07/soap/bindings/JMS/";>
+ xmlns:soapjms="http://www.w3.org/2010/soapjms/";>
<wsdl:types>
<schema targetNamespace="http://cxf.apache.org/jms_simple/types";
xmlns="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
@@ -61,7 +61,7 @@
</wsdl:portType>
<wsdl:binding name="JMSSimplePortBinding" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<wsdl:operation name="echo">
<soap:operation soapAction="echo" style="document"/>
@@ -82,7 +82,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimpleSOAP12PortBinding"
type="tns:JMSSimplePortType">
-<soap12:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap12:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<wsdl:operation name="echo">
<soap12:operation soapAction="echo" style="document"/>
@@ -103,7 +103,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimplePortBinding0006" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:deliveryMode>NON_PERSISTENT</soapjms:deliveryMode>
<soapjms:timeToLive>7200000</soapjms:timeToLive>
@@ -129,7 +129,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimplePortBinding0009" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:deliveryMode>PERSISTENT</soapjms:deliveryMode>
<soapjms:timeToLive>7200000</soapjms:timeToLive>
@@ -155,7 +155,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimplePortBinding0010" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:deliveryMode>NON_PERSISTENT</soapjms:deliveryMode>
<soapjms:timeToLive>7200000</soapjms:timeToLive>
@@ -181,7 +181,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimplePortBinding0013" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:timeToLive>7200000</soapjms:timeToLive>
@@ -204,7 +204,7 @@
</wsdl:binding>
<wsdl:binding name="JMSSimplePortBinding0014" type="tns:JMSSimplePortType">
-<soap:binding style="document"
transport="http://www.w3.org/2008/07/soap/bindings/JMS/"/>
+<soap:binding style="document" transport="http://www.w3.org/2010/soapjms/"/>
<soapjms:timeToLive>7200000</soapjms:timeToLive>
<soapjms:priority>4</soapjms:priority>
