Reapply patch for TUSCANY-2561

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

11 files changed, 79 insertions, 79 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);
diff --git a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
index db9d0e9732..8cd599354a 100644
--- a/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
+++ b/java/sca/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
@@ -26,8 +26,8 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.BServiceImpl"/>
 		<service name="BService">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws name="BServiceSOAP11" requires="soap.1_1" uri="http://localhost:8085/BService/soap11"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BService/soap12"/>
+			<binding.ws name="BServiceSOAP11" requires="SOAP.1_1" uri="http://localhost:8085/BService/soap11"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BService/soap12"/>
 		</service>
     </component>
 
@@ -35,8 +35,8 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.CServiceImpl"/>
 		<service name="CService">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws name="CServiceSOAP12" requires="soap.1_2" uri="http://localhost:8085/CService/soap12"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/CService/soap11"/>
+			<binding.ws name="CServiceSOAP12" requires="SOAP.1_2" uri="http://localhost:8085/CService/soap12"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CService/soap11"/>
 		</service>
     </component>
     
@@ -52,7 +52,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="soap"/>
+			<binding.ws requires="SOAP"/>
         </reference>
     </component>
     
@@ -60,7 +60,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="soap.1_1"/>
+			<binding.ws requires="SOAP.1_1"/>
         </reference>
     </component>
     
@@ -68,7 +68,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="soap.1_2"/>
+			<binding.ws requires="SOAP.1_2"/>
         </reference>
     </component>
     
@@ -76,11 +76,11 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="soap.1_1"/>
+			<binding.ws requires="SOAP.1_1"/>
         </reference>
         <reference name="c1" target="CComponent/CService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws requires="soap.1_2"/>
+			<binding.ws requires="SOAP.1_2"/>
         </reference>
     </component>
 
@@ -88,24 +88,24 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.impl.DServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-			<binding.ws requires="soap.1_2"/>
+			<binding.ws requires="SOAP.1_2"/>
         </reference>
         <reference name="c1" target="CComponent/CService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-			<binding.ws requires="soap.1_1"/>
+			<binding.ws requires="SOAP.1_1"/>
         </reference>
     </component>
 
 	<service name="BServicePromoted" promote="BComponentPromoted">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-		<binding.ws name="BServicePromotedSOAP11" requires="soap.1_1" uri="http://localhost:8085/BServicePromoted/soap11"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
+		<binding.ws name="BServicePromotedSOAP11" requires="SOAP.1_1" uri="http://localhost:8085/BServicePromoted/soap11"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
 	</service>
 
 	<service name="CServicePromoted" promote="CComponentPromoted">
    		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-		<binding.ws name="CServicePromotedSOAP12" requires="soap.1_2" uri="http://localhost:8085/CServicePromoted/soap12"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
+		<binding.ws name="CServicePromotedSOAP12" requires="SOAP.1_2" uri="http://localhost:8085/CServicePromoted/soap12"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
 	</service>
 
 	<component name="BComponentPromoted">
@@ -118,12 +118,12 @@
 
     <reference name="DComponent3B1" promote="DComponent3/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.BService"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServicePromoted/soap12"/>
     </reference>
     
     <reference name="DComponent3C1" promote="DComponent3/c1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.multisoapbindings.CService"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/CServicePromoted/soap11"/>
     </reference>
     
     <component name="DComponent3">
diff --git a/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
index 964996a638..f79df5bf8f 100644
--- a/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ b/java/sca/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
@@ -29,22 +29,22 @@
 
 	<service name="BServiceSOAP" promote="BComponentSOAP">
    		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP"/>
+		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP"/>
 	</service>
 
 	<service name="BServiceSOAP11" promote="BComponentSOAP11">
    		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
 	</service>
 
 	<service name="BServiceSOAP12" promote="BComponentSOAP12">
    		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
 	</service>
 
 	<service name="CService" promote="CComponent">
    		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/CService"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CService"/>
 	</service>
 
 	<component name="BComponent">
@@ -74,17 +74,17 @@
 
     <reference name="AComponent2B1" promote="AComponent2/b1">
       	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="soap" uri="http://localhost:8085/BService"/>
+		<binding.ws requires="SOAP" uri="http://localhost:8085/BService"/>
     </reference>
 
     <reference name="AComponent3B1" promote="AComponent3/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BService"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BService"/>
     </reference>
 
     <reference name="AComponent4B1" promote="AComponent4/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BService"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BService"/>
     </reference>
 
     <reference name="AComponent5B1" promote="AComponent5/b1">
@@ -94,17 +94,17 @@
 
     <reference name="AComponent6B1" promote="AComponent6/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP"/>
+		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP"/>
     </reference>
 
     <reference name="AComponent7B1" promote="AComponent7/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP"/>
     </reference>
 
     <reference name="AComponent8B1" promote="AComponent8/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP"/>
     </reference>
 
     <reference name="AComponent9B1" promote="AComponent9/b1">
@@ -114,17 +114,17 @@
 
     <reference name="AComponent10B1" promote="AComponent10/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP11"/>
+		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP11"/>
     </reference>
 
     <reference name="AComponent11B1" promote="AComponent11/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
     </reference>
 
     <reference name="AComponent12B1" promote="AComponent12/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP11"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP11"/>
     </reference>
 
     <reference name="AComponent13B1" promote="AComponent13/b1">
@@ -134,27 +134,27 @@
 
     <reference name="AComponent14B1" promote="AComponent14/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="soap" uri="http://localhost:8085/BServiceSOAP12"/>
+		<binding.ws requires="SOAP" uri="http://localhost:8085/BServiceSOAP12"/>
     </reference>
 
     <reference name="AComponent15B1" promote="AComponent15/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP12"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP12"/>
     </reference>
 
     <reference name="AComponent16B1" promote="AComponent16/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BServiceSOAP12"/>
     </reference>
 
     <reference name="DComponentB1" promote="DComponent/b1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
-		<binding.ws requires="soap.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
+		<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BServiceSOAP11"/>
     </reference>
     
     <reference name="DComponentC1" promote="DComponent/c1">
        	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
-		<binding.ws requires="soap.1_2" uri="http://localhost:8085/CService"/>
+		<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CService"/>
     </reference>
 
     <component name="AComponent1">
diff --git a/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
index 58831e9b93..61a658ab55 100644
--- a/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
+++ b/java/sca/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
@@ -34,7 +34,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAPImpl"/>
 		<service name="BServiceSOAP">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP"/>
+			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP"/>
 		</service>
     </component>
     
@@ -42,7 +42,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP11Impl"/>
 		<service name="BServiceSOAP11">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
 		</service>
     </component>
     
@@ -50,7 +50,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.BServiceSOAP12Impl"/>
 		<service name="BServiceSOAP12">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
 		</service>
     </component>
     
@@ -58,7 +58,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.CServiceImpl"/>
 		<service name="CService">
        		<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/CComponent"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CComponent"/>
 		</service>
     </component>
 
@@ -74,7 +74,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="soap" uri="http://localhost:8085/BComponent"/>
+			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponent"/>
         </reference>
     </component>
     
@@ -82,7 +82,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponent"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponent"/>
         </reference>
     </component>
     
@@ -90,7 +90,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponent/BService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BService"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponent"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponent"/>
         </reference>
     </component>
     
@@ -106,7 +106,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP/BServiceSOAP">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP"/>
+			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP"/>
         </reference>
     </component>
     
@@ -114,7 +114,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP/BServiceSOAP">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP"/>
         </reference>
     </component>
     
@@ -122,7 +122,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP/BServiceSOAP">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP"/>
         </reference>
     </component>
 
@@ -138,7 +138,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP11"/>
+			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP11"/>
         </reference>
     </component>
     
@@ -146,7 +146,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
         </reference>
     </component>
     
@@ -154,7 +154,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP11"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP11"/>
         </reference>
     </component>
     
@@ -170,7 +170,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="soap" uri="http://localhost:8085/BComponentSOAP12"/>
+			<binding.ws requires="SOAP" uri="http://localhost:8085/BComponentSOAP12"/>
         </reference>
     </component>
     
@@ -178,7 +178,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP12"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP12"/>
         </reference>
     </component>
     
@@ -186,7 +186,7 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.AServiceImpl"/>
         <reference name="b1" target="BComponentSOAP12/BServiceSOAP12">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP12"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/BComponentSOAP12"/>
         </reference>
     </component>
     
@@ -194,11 +194,11 @@
         <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.impl.DServiceImpl"/>
         <reference name="b1" target="BComponentSOAP11/BServiceSOAP11">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.BServiceSOAP11"/>
-			<binding.ws requires="soap.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
+			<binding.ws requires="SOAP.1_1" uri="http://localhost:8085/BComponentSOAP11"/>
         </reference>
         <reference name="c1" target="CComponent/CService">
         	<interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.soapversion.CService"/>
-			<binding.ws requires="soap.1_2" uri="http://localhost:8085/CComponent"/>
+			<binding.ws requires="SOAP.1_2" uri="http://localhost:8085/CComponent"/>
         </reference>
     </component>