Author: antelder
Date: Mon Mar 22 15:35:58 2010
New Revision: 926137

URL: http://svn.apache.org/viewvc?rev=926137&view=rev
Log:
Update the bpel sample bpel script and wsdl to match the bpel itest, and 
comment out the message processing and hard code the response while its not 
working

Modified:
    
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.bpel
    
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.wsdl

Modified: 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.bpel
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.bpel?rev=926137&r1=926136&r2=926137&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.bpel
 (original)
+++ 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.bpel
 Mon Mar 22 15:35:58 2010
@@ -18,23 +18,24 @@
   -->
 <process name="HelloWorld"
     
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld";
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
     xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
-    
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";
+    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+    
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld";    
     xmlns:xsd="http://www.w3.org/2001/XMLSchema";
-    
xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+    xmlns:test="http://testing/";
     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://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
+     namespace="http://testing/"/>
 
    <partnerLinks>
       <partnerLink name="helloPartnerLink" 
partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
    </partnerLinks>
-
+    
    <variables>
-     <variable name="myVar" messageType="test:HelloMessage"/>
+     <variable name="helloMessage" messageType="test:HelloMessage"/>
+     <variable name="helloMessageResponse" 
messageType="test:HelloMessageResponse"/>
      <variable name="tmpVar" type="xsd:string"/>
    </variables>
 
@@ -44,35 +45,35 @@
           partnerLink="helloPartnerLink"
           portType="test:HelloPortType"
           operation="hello"
-          variable="myVar"
+          variable="helloMessage"
           createInstance="yes"/>
 
       <assign name="assign1">
           <copy>
-              <from>concat($myVar.TestPart/test:message/text(), ' 
World')</from>
+              <!-- from>concat($helloMessage.TestPart/test:message/text(), ' 
World')</from -->
+              <from>concat('Hello ', 'world')</from>
               <to variable="tmpVar"/>
           </copy>
-          <!--
+          <!-- Initialize the response -->
           <copy>
               <from>
                   <literal>
-                      <test:hello>
-                          <test:message>$tmpVar</test:message>
-                      </test:hello>
-                  </literal>
+                      <test:helloResponse>
+                          <test:messageResponse>Dummy</test:messageResponse>
+                      </test:helloResponse>
+                  </literal>        
               </from>
-              <to variable="myVar" part="TestPart"/>
-          </copy>
-          -->
+              <to variable="helloMessageResponse" part="TestResponse"/>
+          </copy>                  
           <copy>
-              <from>$tmpVar</from>
-              <to>$myVar.TestPart/test:message</to>
+              <from variable="tmpVar"/>
+              <to>$helloMessageResponse.TestResponse/test:messageResponse</to>
           </copy>
       </assign>
-       <reply name="end"
+       <reply name="end"  
               partnerLink="helloPartnerLink"
-              portType="test:HelloPortType"
+              portType="test:HelloPortType" 
               operation="hello"
-              variable="myVar"/>
+              variable="helloMessageResponse"/>
    </sequence>
 </process>

Modified: 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.wsdl?rev=926137&r1=926136&r2=926137&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
 (original)
+++ 
tuscany/sca-java-2.x/trunk/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
 Mon Mar 22 15:35:58 2010
@@ -18,10 +18,10 @@
   ~ under the License.
   -->
 
-<wsdl:definitions 
-    
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+<wsdl:definitions name="helloworld"
+    targetNamespace="http://testing/";
     xmlns="http://schemas.xmlsoap.org/wsdl/";
-    
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
+    xmlns:tns="http://testing/";
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; 
     xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
     xmlns:xsd="http://www.w3.org/2001/XMLSchema";
@@ -31,7 +31,7 @@
     
     <wsdl:types>
         <schema elementFormDefault="qualified" 
-           
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl";
 
+           targetNamespace="http://testing/"; 
            xmlns="http://www.w3.org/2001/XMLSchema";>
 
             <element name="hello">
@@ -40,7 +40,15 @@
                         <element name="message" type="xsd:string"/>
                     </sequence>
                 </complexType>
-            </element>            
+            </element>
+            
+            <element name="helloResponse">
+                <complexType>
+                    <sequence>
+                        <element name="messageResponse" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>                     
         </schema>
     </wsdl:types>
     
@@ -48,10 +56,14 @@
         <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="HelloPortType">
         <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>
     


Reply via email to