Updates to test different mechanisms for specifying wrapper namespace

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

3 files changed, 25 insertions, 7 deletions

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
index 27471f87c6..9ee8373468 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java
@@ -40,7 +40,7 @@ public class HelloWorld1Impl implements HelloWorld {
     

     public String getGreetingsException(String s) throws ServiceRuntimeException {

         System.out.println("Entering SCA HelloWorld1.getGreetingsException: " + s);

-        String response = helloWorld2.getGreetings(s);

+        String response = helloWorld2.getGreetingsException(s);

         System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);

         throw new ServiceRuntimeException(response);

     }    

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
index 61a852f7c9..d3806b24f4 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl
@@ -70,19 +70,19 @@
     <operation name="getGreetings">

       <soap:operation soapAction=""/>

       <input>

-        <soap:body use="literal"/>

+        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace" />

       </input>

       <output>

-        <soap:body use="literal"/>

+        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsResponseNamespace"/>

       </output>

     </operation>

     <operation name="getGreetingsException">

       <soap:operation soapAction=""/>

       <input>

-        <soap:body use="literal"/>

+        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace"/>

       </input>

       <output>

-        <soap:body use="literal"/>

+        <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionResponseNamespace"/>

       </output>

       <fault name="Exception">

         <soap:fault name="Exception" use="literal"/>

diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
index ccad2481a6..28dedef44c 100644
--- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite
@@ -28,11 +28,29 @@
             <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>

 	    </service>

         <reference name="helloWorld2">

-            <!--binding.ws uri="http://localhost:8088/HelloWorldService/HelloWorld-rpclit" wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/-->

-            <binding.ws uri="http://localhost:8088/HelloWorldService/HelloWorld-rpclit" wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>            

+            <interface.wsdl interface="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.porttype(HelloWorldImpl)"/>

+            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype"

+                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>

+            <!-- 

+                note that it's not necessary to have interface.wsdl here but I left it in after

+                I added the wsdlElement on the binding in order to configure the binding with the

+                wrapper element namespace that appears in the binding configuration

+             -->             

         </reference>	

     </component>

     

+    <component name="HelloWorldService1a">

+        <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>

+        <service name="HelloWorld">

+            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype" 

+                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>

+        </service>

+        <reference name="helloWorld2">

+            <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit" 

+                        wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>            

+        </reference>    

+    </component>    

+    

     <component name="HelloWorldService2">

         <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld2Impl"/>

         <service name="HelloWorld">