Author: dkulp
Date: Tue Feb 16 18:10:49 2010
New Revision: 910633

URL: http://svn.apache.org/viewvc?rev=910633&view=rev
Log:
[CXF-2658, CXF-2531] Use the proper http transport ID in the wsdl for SOAP 1.2

Modified:
    cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
    cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
    cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
    cxf/trunk/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl
    cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
    cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl
    cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
    cxf/trunk/tools/wsdlto/misc/src/test/resources/misctools_wsdl/hello_world_soap12.wsdl
    cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_soap12.wsdl

Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java
URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java (original)
+++ cxf/trunk/common/common/src/main/java/org/apache/cxf/common/WSDLConstants.java Tue Feb 16 18:10:49 2010
@@ -57,6 +57,7 @@
     public static final String SOAP11_PREFIX = "soap";
     public static final String SOAP12_PREFIX = "soap12";
     
+    public static final String NS_SOAP_HTTP_TRANSPORT = "http://schemas.xmlsoap.org/soap/http";
     public static final String NS_SOAP11_HTTP_TRANSPORT = "http://schemas.xmlsoap.org/soap/http";
     
     public static final QName QNAME_SOAP_BINDING = new QName(NS_SOAP, "binding");
@@ -66,7 +67,7 @@
     public static final QName QNAME_SOAP_BINDING_ADDRESS = new QName(NS_SOAP, "address");
 
 
-    public static final String NS_SOAP12_HTTP_TRANSPORT = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
+    public static final String NS_SOAP12_HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
     
     public static final QName QNAME_SOAP12_BINDING = new QName(NS_SOAP12, "binding");
     public static final QName QNAME_SOAP12_BINDING_ADDRESS = new QName(NS_SOAP12, "address");

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=910633&r1=910632&r2=910633&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 Tue Feb 16 18:10:49 2010
@@ -135,9 +135,9 @@
             config = new SoapBindingConfiguration();
         }
         if (WSDLConstants.NS_SOAP12.equals(bindingid)
-            || WSDLConstants.NS_SOAP12_HTTP_TRANSPORT.equals(bindingid)) {
+            || WSDLConstants.NS_SOAP12_HTTP_BINDING.equals(bindingid)) {
             config.setVersion(Soap12.getInstance());
-            config.setTransportURI(WSDLConstants.NS_SOAP12_HTTP_TRANSPORT);
+            config.setTransportURI(WSDLConstants.NS_SOAP_HTTP_TRANSPORT);
         }
         SoapBindingInfo info = new SoapBindingInfo(si,
                                                    bindingid,

Modified: cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java (original)
+++ cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java Tue Feb 16 18:10:49 2010
@@ -194,7 +194,7 @@
 
         SoapBindingInfo sbi = (SoapBindingInfo)bi;
         assertEquals("document", sbi.getStyle());
-        assertTrue(WSDLConstants.NS_SOAP12_HTTP_TRANSPORT.equalsIgnoreCase(sbi.getTransportURI()));
+        assertEquals(WSDLConstants.NS_SOAP_HTTP_TRANSPORT, sbi.getTransportURI());
         assertTrue(sbi.getSoapVersion() instanceof Soap12);
 
         BindingOperationInfo boi = sbi.getOperation(new QName("http://apache.org/hello_world_soap12_http",

Modified: cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java (original)
+++ cxf/trunk/rt/javascript/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java Tue Feb 16 18:10:49 2010
@@ -863,7 +863,7 @@
                 ) {
                 SoapBindingInfo sbi = (SoapBindingInfo)bindingInfo;
                 if (WSDLConstants.NS_SOAP11_HTTP_TRANSPORT.equals(sbi.getTransportURI())
-                    || WSDLConstants.NS_SOAP12_HTTP_TRANSPORT.equals(sbi.getTransportURI())
+                    || WSDLConstants.NS_SOAP12_HTTP_BINDING.equals(sbi.getTransportURI())
                     // we may want this for testing.
                     || LocalTransportFactory.TRANSPORT_ID.equals(sbi.getTransportURI())) {
                     soapBindingInfo = sbi;

Modified: cxf/trunk/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl (original)
+++ cxf/trunk/testutils/src/main/resources/wsdl/hello_world_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -88,7 +88,7 @@
     </wsdl:portType>
 
     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-	<soap12:binding transport="http://www.w3.org/2003/05/soap/bindings/HTTP/" style="document" />
+	<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
 	<operation name="sayHi">
 	    <soap12:operation style="document" soapAction="sayHiAction"/>
 	    <input>

Modified: cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java (original)
+++ cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/SOAPBindingUtil.java Tue Feb 16 18:10:49 2010
@@ -412,12 +412,12 @@
             extElement = (SOAP12Binding)extReg.createExtension(Binding.class,
                                                                new QName(WSDLConstants.NS_SOAP12,
                                                                          "binding"));
-            ((SOAP12Binding)extElement).setTransportURI(WSDLConstants.NS_SOAP12_HTTP_TRANSPORT);
+            ((SOAP12Binding)extElement).setTransportURI(WSDLConstants.NS_SOAP_HTTP_TRANSPORT);
         } else {
             extElement = (SOAPBinding)extReg.createExtension(Binding.class,
                                                              new QName(WSDLConstants.NS_SOAP11,
                                                                        "binding"));
-            ((SOAPBinding)extElement).setTransportURI(WSDLConstants.NS_SOAP11_HTTP_TRANSPORT);
+            ((SOAPBinding)extElement).setTransportURI(WSDLConstants.NS_SOAP_HTTP_TRANSPORT);
         }
         return getSoapBinding(extElement);
     }

Modified: cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -88,7 +88,7 @@
     </wsdl:portType>
 
     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-	<soap12:binding transport="http://www.w3.org/2003/05/soap/bindings/HTTP/" style="document" />
+	<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
 	<operation name="sayHi">
 	    <soap12:operation style="document" soapAction=""/>
 	    <input>

Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -83,7 +83,7 @@
     </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
-    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
+    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="sayHi">
       <soap12:operation soapAction="" style="document"/>
       <wsdl:input name="sayHi">

Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -83,7 +83,7 @@
     </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
-    <soap12:binding style="document" transport="http://www.w3.org/2003/05/soap/bindings/HTTP/"/>
+    <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
     <wsdl:operation name="sayHi">
       <soap12:operation soapAction="" style="document"/>
       <wsdl:input name="sayHi">

Modified: cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java (original)
+++ cxf/trunk/tools/wsdlto/misc/src/test/java/org/apache/cxf/tools/misc/processor/WSDLToSoapProcessorTest.java Tue Feb 16 18:10:49 2010
@@ -242,7 +242,7 @@
                 SoapBinding soapBinding = SOAPBindingUtil.getSoapBinding(obj);
                 assertNotNull(soapBinding);
                 assertTrue("document".equalsIgnoreCase(soapBinding.getStyle()));
-                assertTrue(WSDLConstants.NS_SOAP12_HTTP_TRANSPORT.
+                assertTrue(WSDLConstants.NS_SOAP_HTTP_TRANSPORT.
                            equalsIgnoreCase(soapBinding.getTransportURI()));
             }
 

Modified: cxf/trunk/tools/wsdlto/misc/src/test/resources/misctools_wsdl/hello_world_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/misc/src/test/resources/misctools_wsdl/hello_world_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/misc/src/test/resources/misctools_wsdl/hello_world_soap12.wsdl (original)
+++ cxf/trunk/tools/wsdlto/misc/src/test/resources/misctools_wsdl/hello_world_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -87,7 +87,7 @@
     </wsdl:portType>
 
     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-	<soap12:binding transport="http://www.w3.org/2003/05/soap/bindings/HTTP/" style="document" />
+	<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
 	<operation name="sayHi">
 	    <soap12:operation style="document" soapAction=""/>
 	    <input>

Modified: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_soap12.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_soap12.wsdl?rev=910633&r1=910632&r2=910633&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_soap12.wsdl (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/hello_world_soap12.wsdl Tue Feb 16 18:10:49 2010
@@ -87,7 +87,7 @@
     </wsdl:portType>
 
     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-	<soap12:binding transport="http://www.w3.org/2003/05/soap/bindings/HTTP/" style="document" />
+	<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
 	<operation name="sayHi">
 	    <soap12:operation style="document" soapAction=""/>
 	    <input>