Minor updates/cleanup to bpel/wsdl file

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

3 files changed, 19 insertions, 18 deletions

diff --git a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..b976a53970 100644
--- a/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/java/sca/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
@@ -28,18 +28,18 @@
     <wsdl:types>
         <schema elementFormDefault="qualified" targetNamespace="http://greetings" xmlns="http://www.w3.org/2001/XMLSchema">
 
-            <element name="getGreetings">
+            <element name="greetings">
                 <complexType>
                     <sequence>
-                        <element name="name" type="xsd:string"/>
+                        <element name="greetings" type="xsd:string"/>
                     </sequence>
                 </complexType>
             </element>
 
-            <element name="getGreetingsResponse">
+            <element name="greetingsResponse">
                 <complexType>
                     <sequence>
-                        <element name="getGreetingsReturn" type="xsd:string"/>
+                        <element name="greetingsResponse" type="xsd:string"/>
                     </sequence>
                 </complexType>
             </element>
@@ -47,18 +47,18 @@
         </schema>
     </wsdl:types>
 
-    <wsdl:message name="getGreetingsRequest">
-        <wsdl:part element="tns:getGreetings" name="parameters"/>
+    <wsdl:message name="GreetingsRequest">
+        <wsdl:part element="tns:greetings" name="request"/>
     </wsdl:message>
 
-    <wsdl:message name="getGreetingsResponse">
-        <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
+    <wsdl:message name="GreetingsResponse">
+        <wsdl:part element="tns:greetingsResponse" name="response"/>
     </wsdl:message>
 
     <wsdl:portType name="Greetings">
         <wsdl:operation name="getGreetings">
-            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
-            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
+            <wsdl:input message="tns:GreetingsRequest" name="GreetingsRequest"/>
+            <wsdl:output message="tns:GreetingsResponse" name="GreetingsResponse"/>
         </wsdl:operation>
     </wsdl:portType>
 
@@ -66,10 +66,10 @@
         <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
         <wsdl:operation name="getGreetings">
             <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="getGreetingsRequest">
+            <wsdl:input name="GreetingsRequest">
                 <wsdlsoap:body use="literal"/>
             </wsdl:input>
-            <wsdl:output name="getGreetingsResponse">
+            <wsdl:output name="GreetingsResponse">
                 <wsdlsoap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
@@ -77,7 +77,7 @@
 
     <wsdl:service name="GreetingsService">
         <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding">
-            <wsdlsoap:address location="http://localhost:8085/GreetingsServiceComponent"/>
+            <wsdlsoap:address location="http://localhost:8085/ode/processes/greetings"/>
         </wsdl:port>
     </wsdl:service>
 
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 b508f59bcf..c0317687df 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
@@ -41,8 +41,8 @@
    <variables>
      <variable name="helloMessage" messageType="helloworld:HelloMessage"/>

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

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

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

+     <variable name="greetingsRequest" messageType="greetings:GreetingsRequest"/>

+     <variable name="greetingsResponse" messageType="greetings:GreetingsResponse"/>

    </variables>
 
    <sequence>
@@ -57,7 +57,7 @@
        <assign name="assignToGreetingsRequest">

           <copy>

               <from>$helloMessage.TestPart</from>

-              <to>$greetingsRequest.parameters</to>

+              <to>$greetingsRequest.request</to>

           </copy>

        </assign>

 
@@ -70,7 +70,7 @@
 

        <assign name="assignToHelloResponse">

           <copy>

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

+              <from>$greetingsResponse.parameters/greetings:GreetingsResponse</from>

               <to>$helloMessageResponse.TestPart</to>

           </copy>

        </assign>

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 28c768dd8a..541a713112 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
@@ -48,7 +48,8 @@
                         <element name="messageResponse" type="xsd:string"/>
                     </sequence>
                 </complexType>
-            </element>                          </schema>
+            </element>                          
+        </schema>
     </wsdl:types>
     
     <wsdl:message name="HelloMessage">