tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r659257 - in /incubator/tuscany/java/sca/modules/binding-ws-axis2/src: main/java/org/apache/tuscany/sca/binding/ws/axis2/ main/resources/org/apache/tuscany/sca/binding/ws/axis2/ test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap1...
Date Thu, 22 May 2008 21:00:29 GMT
Author: slaws
Date: Thu May 22 14:00:27 2008
New Revision: 659257

URL: http://svn.apache.org/viewvc?rev=659257&view=rev
Log:
TUSCANY-2248 - changing the string name of the soap intents. Thanks for the patch Vamsi

Modified:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceBindingProvider.java
Thu May 22 14:00:27 2008
@@ -113,7 +113,7 @@
         return true;
     }
 
-    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0",
"soap12");
+    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0",
"soap.1_2");
 
     protected static boolean requiresSOAP12(WebServiceBinding wsBinding) {
         if (wsBinding instanceof IntentAttachPoint) {

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceClient.java
Thu May 22 14:00:27 2008
@@ -92,7 +92,7 @@
     private WebServiceBinding wsBinding;
     private ServiceClient serviceClient;
     Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassnames = null;
-    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0",
"soap12");
+    private static final QName SOAP12_INTENT = new QName("http://www.osoa.org/xmlns/sca/1.0",
"soap.1_2");
     private static final QName MTOM_INTENT =  new QName("http://www.osoa.org/xmlns/sca/1.0",
"MTOM");
     private List<PolicyHandler> policyHandlerList = new ArrayList<PolicyHandler>();
 

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
Thu May 22 14:00:27 2008
@@ -22,7 +22,7 @@
  			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 soap11 soap12" 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 -->
@@ -33,15 +33,13 @@
 	 			 </sca:description>
 	 </sca:intent>
 	
-	 <sca:intent name="soap11"  
-	 			 constrains="sca:binding.ws">
+	 <sca:intent name="soap.1_1">
 	 			 <sca:description>
 	 			 Communitcation thro this binding requires SOAP 1.1
 	 			 </sca:description>
 	 </sca:intent>
 	
-	 <sca:intent name="soap12"  
-	 			 constrains="sca:binding.ws">
+	 <sca:intent name="soap.1_2">
 	 			 <sca:description>
 	 			 Communitcation thro this binding requires SOAP 1.2
 	 			 </sca:description>
@@ -52,4 +50,4 @@
 	 			 Communitcation thro this binding requires MTOM support
 	 			 </sca:description>
 	 </sca:intent>
- </sca:definitions>
\ No newline at end of file
+ </sca:definitions>

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/QuestionMarkWSDLTestCase.java
Thu May 22 14:00:27 2008
@@ -63,7 +63,7 @@
     }
 
     /**
-     * Tests ?wsdl returns a soap 1.1 port when binding uses requires="soap11"
+     * 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();
@@ -81,7 +81,7 @@
     }
 
     /**
-     * Tests ?wsdl returns a soap 1.2 port when binding uses requires="soap12"
+     * 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();

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/HelloWorldSOAP12.composite
Thu May 22 14:00:27 2008
@@ -28,10 +28,10 @@
         <binding.ws requires="soap" uri="http://localhost:8085/helloWorldSOAP"/>
     </service>
     <service name="helloWorldSOAP11" promote="HelloWorldService">
-        <binding.ws requires="soap11" 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="soap12" uri="http://localhost:8085/helloWorldSOAP12"/>
+        <binding.ws requires="soap.1_2" uri="http://localhost:8085/helloWorldSOAP12"/>
     </service>
 
     <component name="HelloWorldService">
@@ -62,10 +62,10 @@
         <binding.ws uri="http://localhost:8085/helloWorldSOAP" requires="soap"/>
     </reference>
     <reference name="helloWorldWS" promote="HelloWorldClientSOAP11/helloWorldWS">
-        <binding.ws uri="http://localhost:8085/helloWorldSOAP11" requires="soap11"/>
+        <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="soap12"/>
+        <binding.ws uri="http://localhost:8085/helloWorldSOAP12" requires="soap.1_2"/>
     </reference>
 
 </composite>

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite?rev=659257&r1=659256&r2=659257&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/soap12/questionmark-wsdl.composite
Thu May 22 14:00:27 2008
@@ -26,11 +26,11 @@
     </service>
 
     <service name="ep2" promote="HelloWorldService">
-        <binding.ws requires="soap11"  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="soap12"  uri="http://localhost:8085/ep3"/>
+        <binding.ws requires="soap.1_2"  uri="http://localhost:8085/ep3"/>
     </service>
 
     <component name="HelloWorldService">



Mime
View raw message