From ef69f9a5078e4a6b2b4154984d14ed378765535e Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 10 Sep 2008 11:38:18 +0000
Subject: 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
---
 .../sca/binding/ws/axis2/AxisPolicyHelper.java     |  2 +-
 .../tuscany/sca/binding/ws/axis2/definitions.xml   | 65 +++++++++++-----------
 .../itests/soap12/QuestionMarkWSDLTestCase.java    |  4 +-
 .../axis2/itests/soap12/HelloWorldSOAP12.composite | 12 ++--
 .../itests/soap12/questionmark-wsdl.composite      |  4 +-
 5 files changed, 44 insertions(+), 43 deletions(-)

(limited to 'branches/sca-java-1.3.2/modules/binding-ws-axis2')

diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
index c5b1666e4f..1f389b422f 100644
--- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java
+++ b/branches/sca-java-1.3.2/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/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index 57b3eaa565..b11059df15 100644
--- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,37 +17,38 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
+
+<!-- $Rev$ $Date$ -->
+
 <sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			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="" 
-									/>	 		
+            targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
+            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=""/>
 
-	<!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->
-	 <sca:intent name="soap"  
-	 			 constrains="sca:binding.ws">
-	 			 <sca:description>
-	 			 Communitcation thro this binding requires SOAP 
-	 			 </sca:description>
-	 </sca:intent>
-	
-	 <sca:intent name="soap.1_1">
-	 			 <sca:description>
-	 			 Communitcation thro this binding requires SOAP 1.1
-	 			 </sca:description>
-	 </sca:intent>
-	
-	 <sca:intent name="soap.1_2">
-	 			 <sca:description>
-	 			 Communitcation thro this binding requires SOAP 1.2
-	 			 </sca:description>
-	 </sca:intent>
-	 <sca:intent name="MTOM"  
-	 			 constrains="sca:binding.ws">
-	 			 <sca:description>
-	 			 Communitcation thro this binding requires MTOM support
-	 			 </sca:description>
-	 </sca:intent>
+    <!-- PolicyIntents defined by the SCA Runtime Extension for WS Binding Axis 2 -->
+    <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:description>
+            Communication through this binding requires SOAP 1.1
+        </sca:description>
+    </sca:intent>
+    
+    <sca:intent name="SOAP.1_2">
+        <sca:description>
+            Communication through this binding requires SOAP 1.2
+        </sca:description>
+    </sca:intent>
+    
+    <sca:intent name="MTOM" constrains="sca:binding.ws">
+        <sca:description>
+            Communication through this binding requires MTOM support
+        </sca:description>
+    </sca:intent>
  </sca:definitions>
diff --git a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java b/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
index 88a8b9b01d..8d378565d4 100644
--- a/branches/sca-java-1.3.2/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
+++ b/branches/sca-java-1.3.2/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/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">
-- 
cgit v1.2.3