From 79bff2fbdb19d3b512e03ab653fbb5c7cf59d205 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 Sep 2008 17:24:31 +0000
Subject: Reapply patch for TUSCANY-2561

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@693171 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/binding/ws/axis2/AxisPolicyHelper.java       |  2 +-
 .../org/apache/tuscany/sca/binding/ws/axis2/definitions.xml  |  8 ++++----
 .../ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java     |  4 ++--
 .../ws/axis2/itests/soap12/HelloWorldSOAP12.composite        | 12 ++++++------
 .../ws/axis2/itests/soap12/questionmark-wsdl.composite       |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

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

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">
-- 
cgit v1.2.3