[jbpm-commits] JBoss JBPM SVN: r1965 - in jbpm3/branches/jpdl-3.2.3.CP/bpel/examples: loan/src/main/bpel/interface and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Aug 21 18:59:44 EDT 2008


Author: alex.guizar at jboss.com
Date: 2008-08-21 18:59:44 -0400 (Thu, 21 Aug 2008)
New Revision: 1965

Modified:
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/loaner.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/task.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/loan.bpel
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/loaner.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/task.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpel
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpelex
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/java/org/jbpm/bpel/tutorial/task/TaskManager_Impl.java
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-management.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-request.wsdl
   jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task.wsdl
Log:
provide a human task management example: BPEL-268

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/loaner.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/loaner.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/loaner.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -2,31 +2,35 @@
 <definitions name="loaner" targetNamespace="http://jbpm.org/examples/loan"
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:tns="http://jbpm.org/examples/loan">
-    <types><xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jbpm.org/examples/loan">
-  <xsd:simpleType name="LoanStatus">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="evaluating"></xsd:enumeration>
-      <xsd:enumeration value="approved"></xsd:enumeration>
-      <xsd:enumeration value="rejected"></xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType></xsd:schema></types>
-    <message name="loanRequest">
-        <part name="borrower" type="xsd:string"></part>
-        <part name="amount" type="xsd:double" />
+  <types>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+      targetNamespace="http://jbpm.org/examples/loan">
+      <xsd:simpleType name="LoanStatus">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="evaluating" />
+          <xsd:enumeration value="approved" />
+          <xsd:enumeration value="rejected" />
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+  <message name="loanRequest">
+    <part name="borrower" type="xsd:string" />
+    <part name="amount" type="xsd:double" />
   </message>
   <message name="statusRequest">
-    <part name="borrower" type="xsd:string"></part>
+    <part name="borrower" type="xsd:string" />
   </message>
   <message name="statusResponse">
-    <part name="status" type="tns:LoanStatus"></part>
+    <part name="status" type="tns:LoanStatus" />
   </message>
   <portType name="Loaner">
     <operation name="requestLoan">
       <input message="tns:loanRequest" />
     </operation>
     <operation name="getLoanStatus">
-      <input message="tns:statusRequest"></input>
-      <output message="tns:statusResponse"></output>
+      <input message="tns:statusRequest" />
+      <output message="tns:statusResponse" />
     </operation>
   </portType>
 </definitions>
\ No newline at end of file

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/task.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/task.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/interface/task.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions name="task" targetNamespace="http://jbpm.org/examples/task"
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jbpm.org/examples/task"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
   <types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
       targetNamespace="http://jbpm.org/examples/task">
       <xsd:complexType name="TaskInfo">
         <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0"
+            maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="taskId" type="xsd:long" />
         <xsd:attribute name="name" type="xsd:string" />
@@ -17,12 +17,13 @@
       </xsd:complexType>
       <xsd:complexType name="TaskList">
         <xsd:sequence>
-          <xsd:element name="taskInfo" type="tns:TaskInfo" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:element name="taskInfo" type="tns:TaskInfo"
+            minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
       </xsd:complexType>
     </xsd:schema>
     <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
         schemaLocation="addressing.xsd" />
     </xsd:schema>
   </types>
@@ -36,6 +37,7 @@
   <message name="endTaskRequest">
     <part name="taskInfo" type="tns:TaskInfo" />
   </message>
+  <message name="endTaskResponse" />
   <message name="getTaskListRequest">
     <part name="actorId" type="xsd:string" />
   </message>
@@ -49,6 +51,7 @@
     </operation>
     <operation name="endTask">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
     <operation name="getTaskList">
       <input message="tns:getTaskListRequest" />
@@ -58,6 +61,7 @@
   <portType name="TaskCallback">
     <operation name="taskEnded">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
   </portType>
 </definitions>
\ No newline at end of file

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/loan.bpel
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/loan.bpel	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel/loan.bpel	2008-08-21 22:59:44 UTC (rev 1965)
@@ -51,6 +51,7 @@
             <variable name="taskCreationResponse" messageType="task:createTaskResponse" />
             <variable name="taskCreationRequest" messageType="task:createTaskRequest" />
             <variable name="taskEndedNotification" messageType="task:endTaskRequest" />
+            <variable name="taskEndedConfirmation" messageType="task:endTaskResponse" />
           </variables>
 
           <correlationSets>
@@ -105,14 +106,22 @@
                     <correlation set="evaluationTask" />
                   </correlations>
 
-                  <assign name="ReadEvaluationResult">
-                    <copy>
-                      <from variable="taskEndedNotification" part="taskInfo"
-                        query="/taskInfo/loanStatus" />
-                      <to part="status" variable="statusResponse" />
-                    </copy>
-                  </assign>
+                  <sequence name="CloseEvaluationTaskSeq">
 
+                    <assign name="ReadEvaluationResult">
+                      <copy>
+                        <from variable="taskEndedNotification" part="taskInfo"
+                          query="/taskInfo/loanStatus" />
+                        <to part="status" variable="statusResponse" />
+                      </copy>
+                    </assign>
+
+                    <reply name="ConfirmEvaluationTaskEnded" partnerLink="taskManager"
+                      portType="task:TaskCallback" operation="taskEnded"
+                      variable="taskEndedConfirmation" />
+
+                  </sequence>
+
                 </onMessage>
 
                 <onMessage partnerLink="borrower" portType="loan:Loaner" operation="getLoanStatus"

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/loaner.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/loaner.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/loaner.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -2,31 +2,35 @@
 <definitions name="loaner" targetNamespace="http://jbpm.org/examples/loan"
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:tns="http://jbpm.org/examples/loan">
-    <types><xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://jbpm.org/examples/loan">
-  <xsd:simpleType name="LoanStatus">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="evaluating"></xsd:enumeration>
-      <xsd:enumeration value="approved"></xsd:enumeration>
-      <xsd:enumeration value="rejected"></xsd:enumeration>
-    </xsd:restriction>
-  </xsd:simpleType></xsd:schema></types>
-    <message name="loanRequest">
-        <part name="borrower" type="xsd:string"></part>
-        <part name="amount" type="xsd:double" />
+  <types>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+      targetNamespace="http://jbpm.org/examples/loan">
+      <xsd:simpleType name="LoanStatus">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="evaluating" />
+          <xsd:enumeration value="approved" />
+          <xsd:enumeration value="rejected" />
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+  <message name="loanRequest">
+    <part name="borrower" type="xsd:string" />
+    <part name="amount" type="xsd:double" />
   </message>
   <message name="statusRequest">
-    <part name="borrower" type="xsd:string"></part>
+    <part name="borrower" type="xsd:string" />
   </message>
   <message name="statusResponse">
-    <part name="status" type="tns:LoanStatus"></part>
+    <part name="status" type="tns:LoanStatus" />
   </message>
   <portType name="Loaner">
     <operation name="requestLoan">
       <input message="tns:loanRequest" />
     </operation>
     <operation name="getLoanStatus">
-      <input message="tns:statusRequest"></input>
-      <output message="tns:statusResponse"></output>
+      <input message="tns:statusRequest" />
+      <output message="tns:statusResponse" />
     </operation>
   </portType>
 </definitions>
\ No newline at end of file

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/task.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/task.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/interface/task.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions name="task" targetNamespace="http://jbpm.org/examples/task"
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jbpm.org/examples/task"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
   <types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
       targetNamespace="http://jbpm.org/examples/task">
       <xsd:complexType name="TaskInfo">
         <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0"
+            maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="taskId" type="xsd:long" />
         <xsd:attribute name="name" type="xsd:string" />
@@ -17,12 +17,13 @@
       </xsd:complexType>
       <xsd:complexType name="TaskList">
         <xsd:sequence>
-          <xsd:element name="taskInfo" type="tns:TaskInfo" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:element name="taskInfo" type="tns:TaskInfo"
+            minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
       </xsd:complexType>
     </xsd:schema>
     <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
         schemaLocation="addressing.xsd" />
     </xsd:schema>
   </types>
@@ -36,6 +37,7 @@
   <message name="endTaskRequest">
     <part name="taskInfo" type="tns:TaskInfo" />
   </message>
+  <message name="endTaskResponse" />
   <message name="getTaskListRequest">
     <part name="actorId" type="xsd:string" />
   </message>
@@ -49,6 +51,7 @@
     </operation>
     <operation name="endTask">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
     <operation name="getTaskList">
       <input message="tns:getTaskListRequest" />
@@ -58,6 +61,7 @@
   <portType name="TaskCallback">
     <operation name="taskEnded">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
   </portType>
 </definitions>
\ No newline at end of file

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpel
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpel	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpel	2008-08-21 22:59:44 UTC (rev 1965)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpws:process exitOnStandardFault="yes" name="LoanApproval"
+<bpws:process name="LoanApproval"
   targetNamespace="http://jbpm.org/examples/loan"
   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
   xmlns:jbpm="urn:jbpm.org:bpel-1.1" xmlns:loan="http://jbpm.org/examples/loan"
   xmlns:task="http://jbpm.org/examples/task"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="loan.wsdl"
-    namespace="http://jbpm.org/examples/loan" />
-  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="interface/loaner.wsdl"
-    namespace="http://jbpm.org/examples/loan" />
-  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/" location="interface/task.wsdl"
-    namespace="http://jbpm.org/examples/task" />
+  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/"
+    location="loan.wsdl" namespace="http://jbpm.org/examples/loan" />
+  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/"
+    location="interface/loaner.wsdl" namespace="http://jbpm.org/examples/loan" />
+  <bpws:import importType="http://schemas.xmlsoap.org/wsdl/"
+    location="interface/task.wsdl" namespace="http://jbpm.org/examples/task" />
   <bpws:partnerLinks>
-    <bpws:partnerLink myRole="loaner" name="borrower" partnerLinkType="loan:borrower-loaner" />
+    <bpws:partnerLink myRole="loaner" name="borrower"
+      partnerLinkType="loan:borrower-loaner" />
   </bpws:partnerLinks>
   <bpws:variables>
     <bpws:variable messageType="loan:loanRequest" name="loanRequest" />
@@ -23,8 +24,9 @@
     <bpws:correlationSet name="borrowerName" properties="loan:borrowerName" />
   </bpws:correlationSets>
   <bpws:sequence name="Main">
-    <bpws:receive createInstance="yes" name="AcceptLoanRequest" operation="requestLoan"
-      partnerLink="borrower" portType="loan:Loaner" variable="loanRequest">
+    <bpws:receive createInstance="yes" name="AcceptLoanRequest"
+      operation="requestLoan" partnerLink="borrower" portType="loan:Loaner"
+      variable="loanRequest">
       <bpws:correlations>
         <bpws:correlation initiate="yes" set="borrowerName" />
       </bpws:correlations>
@@ -41,12 +43,18 @@
         <bpws:scope name="EscalateToAgent">
           <bpws:partnerLinks>
             <bpws:partnerLink myRole="taskRequester" name="taskManager"
-              partnerLinkType="loan:taskRequester-taskManager" partnerRole="taskManager" />
+              partnerLinkType="loan:taskRequester-taskManager"
+              partnerRole="taskManager" />
           </bpws:partnerLinks>
           <bpws:variables>
-            <bpws:variable messageType="task:createTaskResponse" name="taskCreationResponse" />
-            <bpws:variable messageType="task:createTaskRequest" name="taskCreationRequest" />
-            <bpws:variable messageType="task:endTaskRequest" name="taskEndedNotification" />
+            <bpws:variable messageType="task:createTaskResponse"
+              name="taskCreationResponse" />
+            <bpws:variable messageType="task:createTaskRequest"
+              name="taskCreationRequest" />
+            <bpws:variable messageType="task:endTaskRequest"
+              name="taskEndedNotification" />
+            <bpws:variable messageType="task:endTaskResponse"
+              name="taskEndedConfirmation" />
           </bpws:variables>
           <bpws:correlationSets>
             <bpws:correlationSet name="evaluationTask" properties="loan:taskId" />
@@ -76,11 +84,13 @@
                 <bpws:to part="replyTo" variable="taskCreationRequest" />
               </bpws:copy>
             </bpws:assign>
-            <bpws:invoke inputVariable="taskCreationRequest" name="CreateEvaluationTask"
-              operation="createTask" outputVariable="taskCreationResponse" partnerLink="taskManager"
+            <bpws:invoke inputVariable="taskCreationRequest"
+              name="CreateEvaluationTask" operation="createTask"
+              outputVariable="taskCreationResponse" partnerLink="taskManager"
               portType="task:TaskManager">
               <bpws:correlations>
-                <bpws:correlation initiate="yes" pattern="in" set="evaluationTask" />
+                <bpws:correlation initiate="yes" pattern="in"
+                  set="evaluationTask" />
               </bpws:correlations>
             </bpws:invoke>
             <bpws:assign name="SetEvaluating" validate="no">
@@ -93,18 +103,26 @@
               <bpws:condition><![CDATA[$statusResponse.status = 'evaluating']]></bpws:condition>
               <bpws:pick name="EvaluationMenu">
                 <bpws:onMessage operation="taskEnded" partnerLink="taskManager"
-                  portType="task:TaskCallback" variable="taskEndedNotification">
+                  portType="task:TaskCallback"
+                  variable="taskEndedNotification">
                   <bpws:correlations>
                     <bpws:correlation initiate="no" set="evaluationTask" />
                   </bpws:correlations>
-                  <bpws:assign name="ReadEvaluationResult" validate="no">
-                    <bpws:copy>
-                      <bpws:from part="taskInfo" variable="taskEndedNotification">
-                        <bpws:query><![CDATA[loanStatus]]></bpws:query>
-                      </bpws:from>
-                      <bpws:to part="status" variable="statusResponse" />
-                    </bpws:copy>
-                  </bpws:assign>
+                  <bpws:sequence name="CloseEvaluationTaskSeq">
+                    <bpws:assign name="ReadEvaluationResult" validate="no">
+                      <bpws:copy>
+                        <bpws:from part="taskInfo"
+                          variable="taskEndedNotification">
+                          <bpws:query><![CDATA[loanStatus]]></bpws:query>
+                        </bpws:from>
+                        <bpws:to part="status" variable="statusResponse" />
+                      </bpws:copy>
+                    </bpws:assign>
+                    <bpws:reply name="ConfirmEvaluationTaskEnded"
+                      operation="taskEnded" partnerLink="taskManager"
+                      portType="task:TaskCallback"
+                      variable="taskEndedConfirmation" />
+                  </bpws:sequence>
                 </bpws:onMessage>
                 <bpws:onMessage operation="getLoanStatus" partnerLink="borrower"
                   portType="loan:Loaner" variable="statusRequest">
@@ -112,7 +130,8 @@
                     <bpws:correlation initiate="no" set="borrowerName" />
                   </bpws:correlations>
                   <bpws:reply name="NotifyEvaluating" operation="getLoanStatus"
-                    partnerLink="borrower" portType="loan:Loaner" variable="statusResponse" />
+                    partnerLink="borrower" portType="loan:Loaner"
+                    variable="statusResponse" />
                 </bpws:onMessage>
               </bpws:pick>
             </bpws:while>
@@ -120,13 +139,13 @@
         </bpws:scope>
       </bpws:else>
     </bpws:if>
-    <bpws:receive name="AcceptStatusRequest" operation="getLoanStatus" partnerLink="borrower"
-      portType="loan:Loaner" variable="statusRequest">
+    <bpws:receive name="AcceptStatusRequest" operation="getLoanStatus"
+      partnerLink="borrower" portType="loan:Loaner" variable="statusRequest">
       <bpws:correlations>
         <bpws:correlation initiate="no" set="borrowerName" />
       </bpws:correlations>
     </bpws:receive>
-    <bpws:reply name="SendStatus" operation="getLoanStatus" partnerLink="borrower"
-      portType="loan:Loaner" variable="statusResponse" />
+    <bpws:reply name="SendStatus" operation="getLoanStatus"
+      partnerLink="borrower" portType="loan:Loaner" variable="statusResponse" />
   </bpws:sequence>
 </bpws:process>

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpelex
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpelex	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/loan/src/main/bpel2/loan.bpelex	2008-08-21 22:59:44 UTC (rev 1965)
@@ -2,7 +2,7 @@
 <extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/">
   <extensions>
     <extendedObject href="loan.bpel#/"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1197519198734"/>
+    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1218525310000"/>
   </extensions>
   <extensions>
     <extendedObject href="loan.bpel#//@activity/@activities.0"/>
@@ -89,11 +89,11 @@
     <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:OnMessageExtension"/>
   </extensions>
   <extensions>
-    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity"/>
+    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity/@activities.0"/>
     <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
   </extensions>
   <extensions>
-    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity/@copy.0"/>
+    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity/@activities.0/@copy.0"/>
     <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
   </extensions>
   <extensions>
@@ -124,4 +124,16 @@
     <extendedObject href="loan.bpel#//@activity/@activities.1/@activity/@copy.0"/>
     <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
   </extensions>
+  <extensions>
+    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity"/>
+    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+  </extensions>
+  <extensions>
+    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@activity/@activities.3/@activity/@messages.0/@activity/@activities.1"/>
+    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+  </extensions>
+  <extensions>
+    <extendedObject href="loan.bpel#//@activity/@activities.1/@else/@activity/@variables/@children.3"/>
+    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
+  </extensions>
 </extensionmodel:ExtensionMap>

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/java/org/jbpm/bpel/tutorial/task/TaskManager_Impl.java
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/java/org/jbpm/bpel/tutorial/task/TaskManager_Impl.java	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/java/org/jbpm/bpel/tutorial/task/TaskManager_Impl.java	2008-08-21 22:59:44 UTC (rev 1965)
@@ -158,40 +158,40 @@
 
   public void endTask(TaskInfo taskInfo) {
     JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+    String replyAddress;
     try {
       // end task instance
       TaskInstance taskInstance = jbpmContext.loadTaskInstance(taskInfo.getTaskId().longValue());
+      replyAddress = (String) taskInstance.getVariable(REPLY_ADDRESS_VARIABLE);
       taskInstance.end();
+    }
+    catch (RuntimeException e) {
+      jbpmContext.setRollbackOnly();
+      throw e;
+    }
+    finally {
+      jbpmContext.close();
+    }
 
+    try {
       // acquire endpoint proxy
       TaskCallback taskCallback = (TaskCallback) taskCallbackService.getPort(TaskCallback.class);
 
       // configure callback address
-      String address = (String) taskInstance.getVariable(REPLY_ADDRESS_VARIABLE);
       Stub taskCallbackStub = (Stub) taskCallback;
-      taskCallbackStub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, address);
+      taskCallbackStub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, replyAddress);
 
-      log.debug("calling back endpoint at: " + address);
-      taskCallback.taskEnded(taskInfo);
+      log.debug("calling back endpoint at: " + replyAddress);
+      taskCallback.taskEnded(taskInfo);      
     }
     catch (ServiceException e) {
       log.error("could not get callback endpoint proxy", e);
-      jbpmContext.setRollbackOnly();
       throw new SOAPFaultException(SERVER_CODE, "task callback failed", null, null);
     }
     catch (RemoteException e) {
       log.error("endpoint callback failed", e);
-      jbpmContext.setRollbackOnly();
       throw new SOAPFaultException(SERVER_CODE, "task callback failed", null, null);
     }
-    catch (RuntimeException e) {
-      jbpmContext.setRollbackOnly();
-      throw e;
-    }
-    finally {
-      jbpmContext.close();
-    }
-
   }
 
   public TaskList getTaskList(String actorId) {
@@ -212,7 +212,6 @@
 
         taskInfos[i] = taskInfo;
       }
-
       return new TaskList(taskInfos);
     }
     finally {

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-management.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-management.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-management.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -19,6 +19,9 @@
       <input>
         <soap:body use="literal" namespace="http://jbpm.org/examples/task" />
       </input>
+      <output>
+        <soap:body use="literal" namespace="http://jbpm.org/examples/task" />
+      </output>
     </operation>
     <operation name="getTaskList">
       <soap:operation soapAction="http://jbpm.org/examples/task/getTaskList" />

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-request.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-request.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task-request.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -10,6 +10,9 @@
       <input>
         <soap:body use="literal" namespace="http://jbpm.org/examples/task" />
       </input>
+      <output>
+        <soap:body use="literal" namespace="http://jbpm.org/examples/task" />
+      </output>
     </operation>
   </binding>
   <service name="TaskRequestService">

Modified: jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task.wsdl
===================================================================
--- jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task.wsdl	2008-08-21 21:48:55 UTC (rev 1964)
+++ jbpm3/branches/jpdl-3.2.3.CP/bpel/examples/task/src/main/resources/web/wsdl/task.wsdl	2008-08-21 22:59:44 UTC (rev 1965)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions name="task" targetNamespace="http://jbpm.org/examples/task"
   xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jbpm.org/examples/task"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
   <types>
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
       targetNamespace="http://jbpm.org/examples/task">
       <xsd:complexType name="TaskInfo">
         <xsd:sequence>
-          <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:any namespace="##other" processContents="lax" minOccurs="0"
+            maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="taskId" type="xsd:long" />
         <xsd:attribute name="name" type="xsd:string" />
@@ -17,12 +17,13 @@
       </xsd:complexType>
       <xsd:complexType name="TaskList">
         <xsd:sequence>
-          <xsd:element name="taskInfo" type="tns:TaskInfo" minOccurs="0" maxOccurs="unbounded" />
+          <xsd:element name="taskInfo" type="tns:TaskInfo"
+            minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
       </xsd:complexType>
     </xsd:schema>
     <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+      <xsd:import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"
         schemaLocation="addressing.xsd" />
     </xsd:schema>
   </types>
@@ -36,6 +37,7 @@
   <message name="endTaskRequest">
     <part name="taskInfo" type="tns:TaskInfo" />
   </message>
+  <message name="endTaskResponse" />
   <message name="getTaskListRequest">
     <part name="actorId" type="xsd:string" />
   </message>
@@ -49,6 +51,7 @@
     </operation>
     <operation name="endTask">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
     <operation name="getTaskList">
       <input message="tns:getTaskListRequest" />
@@ -58,6 +61,7 @@
   <portType name="TaskCallback">
     <operation name="taskEnded">
       <input message="tns:endTaskRequest" />
+      <output message="tns:endTaskResponse" />
     </operation>
   </portType>
 </definitions>
\ No newline at end of file




More information about the jbpm-commits mailing list