Merge fix from trunk to 1.3.2 branch for TUSCANY-2561: Soap intents are lower case while the policy framework says that they should be upper case

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

2 files changed, 8 insertions, 8 deletions

diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
index 5042dc7a0c..fbd4c66c45 100644
--- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
+++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
index d2e2fd3e09..033a77eea6 100644
--- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
+++ b/branches/sca-java-1.3.2/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">