You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2013/05/22 18:33:53 UTC
svn commit: r1485275 - in /cxf/branches/2.7.x-fixes: ./
api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Author: ay
Date: Wed May 22 16:33:53 2013
New Revision: 1485275
URL: http://svn.apache.org/r1485275
Log:
Merged revisions 1485268 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1485268 | ay | 2013-05-22 18:16:44 +0200 (Wed, 22 May 2013) | 1 line
[CXF-5032] Suppor SOAP 1.2 in DynamicClient
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1485275&r1=1485274&r2=1485275&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Wed May 22 16:33:53 2013
@@ -37,6 +37,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.wsdl.extensions.soap.SOAPBinding;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
@@ -253,12 +254,22 @@ public class ClientImpl
for (ServiceInfo svcfo : svc.getServiceInfos()) {
for (EndpointInfo e : svcfo.getEndpoints()) {
BindingInfo bfo = e.getBinding();
-
- if (bfo.getBindingId().equals("http://schemas.xmlsoap.org/wsdl/soap/")) {
+ String bid = bfo.getBindingId();
+ if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(bid)) {
for (Object o : bfo.getExtensors().get()) {
if (o instanceof SOAPBinding) {
SOAPBinding soapB = (SOAPBinding)o;
- if (soapB.getTransportURI().equals("http://schemas.xmlsoap.org/soap/http")) {
+ if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) {
+ epfo = e;
+ break;
+ }
+ }
+ }
+ } else if ("http://schemas.xmlsoap.org/wsdl/soap12/".equals(bid)) {
+ for (Object o : bfo.getExtensors().get()) {
+ if (o instanceof SOAP12Binding) {
+ SOAP12Binding soapB = (SOAP12Binding)o;
+ if ("http://schemas.xmlsoap.org/soap/http".equals(soapB.getTransportURI())) {
epfo = e;
break;
}