Reapply patch for TUSCANY-2561

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@693171 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 26 insertions, 26 deletions

diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index c5b1666e4f..1f389b422f 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
@@ -39,7 +39,7 @@ public class AxisPolicyHelper {
     public static final QName CONFIDENTIALITY_INTENT = new QName(XMLNS_SCA_1_0, "confidentiality");
     public static final QName INTEGRITY_INTENT = new QName(XMLNS_SCA_1_0, "integrity");
     public static final QName MTOM_INTENT = new QName(XMLNS_SCA_1_0, "MTOM");
-    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "soap12");
+    public static final QName SOAP12_INTENT = new QName(XMLNS_SCA_1_0, "SOAP12");
 
     public static PolicySet getPolicySet(Binding wsBinding, QName intentName) {
         PolicySet returnPolicySet = null;
diff --git a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index dc3c0c660f..b11059df15 100644
--- a/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -25,22 +25,22 @@
             xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"

             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">

             

-    <sca:bindingType type="sca:binding.ws"  mayProvide="soap soap.1_1 soap.1_2" alwaysProvides=""/>

+    <sca:bindingType type="sca:binding.ws"  mayProvide="SOAP SOAP.1_1 SOAP.1_2" alwaysProvides=""/>

 

     <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->

-    <sca:intent name="soap" constrains="sca:binding.ws">

+    <sca:intent name="SOAP" constrains="sca:binding.ws">

         <sca:description>

             Communication through this binding requires SOAP

         </sca:description>

     </sca:intent>

     

-    <sca:intent name="soap.1_1">

+    <sca:intent name="SOAP.1_1">

         <sca:description>

             Communication through this binding requires SOAP 1.1

         </sca:description>

     </sca:intent>

     

-    <sca:intent name="soap.1_2">

+    <sca:intent name="SOAP.1_2">

         <sca:description>

             Communication through this binding requires SOAP 1.2

         </sca:description>

diff --git a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 88a8b9b01d..8d378565d4 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
@@ -66,7 +66,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
     }
 
     /**
-     * Tests ?wsdl returns a soap 1.1 port when binding uses requires="soap.1_1"
+     * Tests ?wsdl returns a soap 1.1 port when binding uses requires="SOAP.1_1"
      */
     public void testSOAP11Endpoint() throws Exception {
         WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
@@ -86,7 +86,7 @@ public class QuestionMarkWSDLTestCase extends TestCase {
     }
 
     /**
-     * Tests ?wsdl returns a soap 1.2 port when binding uses requires="soap.1_2"
+     * Tests ?wsdl returns a soap 1.2 port when binding uses requires="SOAP.1_2"
      */
     public void testSOAP12Endpoint() throws Exception {
         WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index 5042dc7a0c..fbd4c66c45 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
@@ -25,13 +25,13 @@
         <binding.ws uri="http://localhost:8085/helloWorld"/>

     </service>

     <service name="helloWorldSOAP" promote="HelloWorldService">

-        <binding.ws requires="soap" uri="http://localhost:8085/helloWorldSOAP"/>

+        <binding.ws requires="SOAP" uri="http://localhost:8085/helloWorldSOAP"/>

     </service>

     <service name="helloWorldSOAP11" promote="HelloWorldService">

-        <binding.ws requires="soap.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>

+        <binding.ws requires="SOAP.1_1" uri="http://localhost:8085/helloWorldSOAP11"/>

     </service>

     <service name="helloWorldSOAP12" promote="HelloWorldService">

-        <binding.ws requires="soap.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>

+        <binding.ws requires="SOAP.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>

     </service>

 

     <component name="HelloWorldService">

@@ -59,13 +59,13 @@
         <binding.ws uri="http://localhost:8085/helloWorld"/>

     </reference>

     <reference name="helloWorldWS" promote="HelloWorldClientSOAP/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="soap"/>

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="SOAP"/>

     </reference>

     <reference name="helloWorldWS" promote="HelloWorldClientSOAP11/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="soap.1_1"/>

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="SOAP.1_1"/>

     </reference>

     <reference name="helloWorldWS" promote="HelloWorldClientSOAP12/helloWorldWS">

-        <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="soap.1_2"/>

+        <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="SOAP.1_2"/>

     </reference>

 

 </composite>

diff --git a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index d2e2fd3e09..033a77eea6 100644
--- a/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
+++ b/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
@@ -26,11 +26,11 @@
     </service>

 

     <service name="ep2" promote="HelloWorldService">

-        <binding.ws requires="soap.1_1"  uri="http://localhost:8085/ep2"/>

+        <binding.ws requires="SOAP.1_1"  uri="http://localhost:8085/ep2"/>

     </service>

 

     <service name="ep3" promote="HelloWorldService">

-        <binding.ws requires="soap.1_2"  uri="http://localhost:8085/ep3"/>

+        <binding.ws requires="SOAP.1_2"  uri="http://localhost:8085/ep3"/>

     </service>

 

     <component name="HelloWorldService">

diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index d94ed30c34..de1cab15d8 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
@@ -61,7 +61,7 @@ import org.apache.tuscany.sca.xsd.XSDFactory;
  */
 public class BindingWSDLGenerator {
     private static final Logger logger = Logger.getLogger(BindingWSDLGenerator.class.getName());
-    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "soap.1_2");
+    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0", "SOAP.1_2");
 
     public static boolean printWSDL;     // external code sets this to print generated WSDL
 
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
index 29b354810a..c84e2e3ebe 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
@@ -263,9 +263,9 @@ public class Interface2WSDLGenerator {
         QName name = getQName(iface);
         Definition definition = factory.newDefinition();
         if (requiresSOAP12) {
-            definition.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
+            definition.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/");
         } else {
-            definition.addNamespace("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
+            definition.addNamespace("SOAP", "http://schemas.xmlsoap.org/wsdl/soap/");
         }
         definition.addNamespace("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         definition.addNamespace("xs", SCHEMA_NS);
diff --git a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index d2e2e9eb34..ebfbdc509a 100644
--- a/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/java/sca/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
@@ -280,9 +280,9 @@ public class WSDLServiceGenerator {
         if (wsBinding.getBinding() == null && ports.size() == 0) {
             Binding binding = helper.createBinding(def, portType);
             if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) {
-                def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
+                def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/");
             } else {
-                def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
+                def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/");
             }
             helper.createBindingOperations(def, binding, portType);
             binding.setUndefined(false);
@@ -310,9 +310,9 @@ public class WSDLServiceGenerator {
                 String endpointURI = computeActualURI(wsBinding, null);
                 Port port = helper.createPort(def, wsBinding.getBinding(), service, endpointURI);
                 if (BindingWSDLGenerator.requiresSOAP12(wsBinding)) {
-                    def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
+                    def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/");
                 } else {
-                    def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
+                    def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/");
                 }
                 wsBinding.setPort(port);
             }
@@ -349,10 +349,10 @@ public class WSDLServiceGenerator {
             List bindingExtensions = binding.getExtensibilityElements();
             for (final Object extension : bindingExtensions) {
                 if (extension instanceof SOAPBinding) {
-                    newDef.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
+                    newDef.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/");
                 }
                 if (extension instanceof SOAP12Binding) {
-                    newDef.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
+                    newDef.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/");
                 }
             }
         }
@@ -412,7 +412,7 @@ public class WSDLServiceGenerator {
         for (final Object extension : portExtensions) {
             ExtensibilityElement newExt = null;
             if (extension instanceof SOAPAddress) {
-                def.addNamespace("soap11", "http://schemas.xmlsoap.org/wsdl/soap/");
+                def.addNamespace("SOAP11", "http://schemas.xmlsoap.org/wsdl/soap/");
                 try {
                     newExt = def.getExtensionRegistry().createExtension(
                              Port.class, WSDLDefinitionGenerator.SOAP_ADDRESS);
@@ -422,7 +422,7 @@ public class WSDLServiceGenerator {
                 ((SOAPAddress)newExt).setLocationURI(uri);
                 newPort.addExtensibilityElement(newExt);
             } else if (extension instanceof SOAP12Address) {
-                def.addNamespace("soap12", "http://schemas.xmlsoap.org/wsdl/soap12/");
+                def.addNamespace("SOAP12", "http://schemas.xmlsoap.org/wsdl/soap12/");
                 try {
                     newExt = def.getExtensionRegistry().createExtension(
                              Port.class, WSDLDefinitionGenerator.SOAP12_ADDRESS);