Updating wsdl/bpel files to avoid generating java artifacts utilizing holder pattern

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

2 files changed, 20 insertions, 9 deletions

diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index 5ec2cc9f2e..b508f59bcf 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
@@ -25,7 +25,7 @@
     xmlns:helloworld="http://helloworld"

     xmlns:greetings="http://greetings"
     queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
 
   <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
      namespace="http://helloworld"/>
@@ -40,7 +40,7 @@
     
    <variables>
      <variable name="helloMessage" messageType="helloworld:HelloMessage"/>

-     <variable name="helloResponse" messageType="helloworld:HelloMessage"/>

+     <variable name="helloMessageResponse" messageType="helloworld:HelloMessageResponse"/>

      <variable name="greetingsRequest" messageType="greetings:getGreetingsRequest"/>

      <variable name="greetingsResponse" messageType="greetings:getGreetingsResponse"/>

    </variables>
@@ -71,7 +71,7 @@
        <assign name="assignToHelloResponse">

           <copy>

               <from>$greetingsResponse.parameters/greetings:getGreetingsReturn</from>

-              <to>$helloResponse.TestPart</to>

+              <to>$helloMessageResponse.TestPart</to>

           </copy>

        </assign>

 

@@ -79,6 +79,6 @@
               operation="hello"
               partnerLink="helloPartnerLink"
               portType="helloworld:HelloWorld" 
-              variable="helloResponse"/>
+              variable="helloMessageResponse"/>
    </sequence>
 </process>
diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..28c768dd8a 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/java/sca/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
@@ -33,25 +33,36 @@
         <schema elementFormDefault="qualified" 
            targetNamespace="http://helloworld" 
            xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
+           
+           <element name="hello">
                 <complexType>
                     <sequence>
                         <element name="message" type="xsd:string"/>
                     </sequence>
                 </complexType>
-            </element>            
-        </schema>
+            </element>
+            
+            <element name="helloResponse">
+                <complexType>
+                    <sequence>
+                        <element name="messageResponse" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>                          </schema>
     </wsdl:types>
     
     <wsdl:message name="HelloMessage">
         <wsdl:part element="tns:hello" name="TestPart"/>
     </wsdl:message>
     
+    <wsdl:message name="HelloMessageResponse">
+        <wsdl:part element="tns:helloResponse" name="TestResponse"/>
+    </wsdl:message>    
+    
     <wsdl:portType name="HelloWorld">
         <wsdl:operation name="hello">
             <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessage" name="TestOut"/>
+            <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/>
         </wsdl:operation>    
     </wsdl:portType>