Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[264] trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/ src
|
From: <ale...@us...> - 2009-06-19 11:50:13
|
Revision: 264
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=264&view=rev
Author: alexloewen
Date: 2009-06-19 11:50:05 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
added some fault handling to deleteCourse
fault handling still doesn't work
Modified Paths:
--------------
trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel
trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl
trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel
trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl
trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel
Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel 2009-06-18 10:50:18 UTC (rev 263)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.bpel 2009-06-19 11:50:05 UTC (rev 264)
@@ -8,7 +8,7 @@
xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment"
xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling"
- xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:ns1="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory">
+ xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCategory" xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:ns1="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions">
<import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" location="DeleteCategory.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
@@ -22,6 +22,7 @@
<variable name="DeleteCategoryOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryResponse"/>
<variable name="DeleteCategoryIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest"/>
<variable name="DeleteCategoryFault" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest" />
+ <variable name="DeleteCategoryF" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:faultMessage" />
</variables>
<sequence>
<scope name="DeleteCategoryScope" xmlns:tns="urn:ilUserAdministration">
@@ -43,7 +44,13 @@
<to variable="DeleteCategoryFault"/>
</copy>
</assign>
- <throw faultName="ns1:deleteCategoryFailedSystemFault"/>
+ <assign name="marshallFaultString">
+ <copy>
+ <from>concat('SID=', $DeleteCategoryIn.SID, 'Category=', sxxf:doMarshal($DeleteCategoryIn.category))</from>
+ <to variable="DeleteCategoryF" part="faultString"/>
+ </copy>
+ </assign>
+ <throw faultName="ns1:deleteCategoryFailedSystemFault" faultVariable="DeleteCategoryF"/>
</sequence>
</catch>
<catchAll>
@@ -63,7 +70,7 @@
<to variable="DeleteCategoryFault"/>
</copy>
</assign>
- <throw faultName="ns1:deleteCategoryFailedUnknownFault" faultVariable="DeleteCategoryFault"/>
+ <throw faultName="ns1:deleteCategoryFailedUnknownFault"/>
</sequence>
</catchAll>
</faultHandlers>
@@ -108,7 +115,7 @@
<to variable="DeleteCategoryFault"/>
</copy>
</assign>
- <throw faultName="ns1:deleteCategoryFailedByIlias" faultVariable="DeleteCategoryFault"/>
+ <throw faultName="ns1:deleteCategoryFailedByIlias"/>
</sequence>
</else>
</if>
Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl 2009-06-18 10:50:18 UTC (rev 263)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCategory.wsdl 2009-06-19 11:50:05 UTC (rev 264)
@@ -15,13 +15,16 @@
<message name="deleteCategoryResponse">
<part name="success" type="xsd:boolean"/>
</message>
+ <message name="faultMessage">
+ <part name="faultString" type="xsd:string"/>
+ </message>
<portType name="DeleteCategoryPortType">
<operation name="deleteCategory">
<input name="input1" message="tns:deleteCategoryRequest"/>
<output name="output1" message="tns:deleteCategoryResponse"/>
- <fault name="deleteCategoryFailedByIlias" message="tns:deleteCategoryRequest"/>
- <fault name="deleteCategoryFailedSystemFault" message="tns:deleteCategoryRequest"/>
- <fault name="deleteCategoryFailedUnknownFault" message="tns:deleteCategoryRequest"/>
+ <fault name="deleteCategoryFailedByIlias" message="tns:faultMessage"/>
+ <fault name="deleteCategoryFailedSystemFault" message="tns:faultMessage"/>
+ <fault name="deleteCategoryFailedUnknownFault" message="tns:faultMessage"/>
</operation>
</portType>
<plnk:partnerLinkType name="DeleteCategory">
Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel 2009-06-18 10:50:18 UTC (rev 263)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.bpel 2009-06-19 11:50:05 UTC (rev 264)
@@ -8,7 +8,7 @@
xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor"
xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment"
xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling"
- xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse">
+ xmlns:tns="http://enterprise.netbeans.org/bpel/ILIASClientAdapter/DeleteCourse" xmlns:ns0="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse">
<import namespace="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" location="DeleteCourse.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<import namespace="http://enterprise.netbeans.org/bpel/ilias-3.10.5-Wrapper" location="ilias-3.10.5-Wrapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
<import namespace="urn:ilUserAdministration" location="ilias-3.10.5-fixed.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
@@ -17,30 +17,85 @@
<partnerLink name="IliasAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" partnerLinkType="tns:DeleteCourse" myRole="DeleteCoursePortTypeRole"/>
</partnerLinks>
<variables>
+ <variable name="deleteCourseFault" messageType="ns0:deleteCourseFaultMessage"/>
<variable name="DeleteCourseOut" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteCourseResponse"/>
<variable name="DeleteCourseIn" xmlns:tns="urn:ilUserAdministration" messageType="tns:deleteCourseRequest"/>
<variable name="DeleteCourseOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseResponse"/>
<variable name="DeleteCourseOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" messageType="tns:DeleteCourseRequest"/>
</variables>
<sequence>
- <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationIn"/>
- <assign name="prepareForDeleteCourse">
- <copy>
- <from variable="DeleteCourseOperationIn" part="SID"/>
- <to variable="DeleteCourseIn" part="sid"/>
- </copy>
- <copy>
- <from>177</from>
- <to variable="DeleteCourseIn" part="course_id"/>
- </copy>
- </assign>
- <invoke name="deleteCourseInvoke" partnerLink="ILIAS" operation="deleteCourse" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="DeleteCourseIn" outputVariable="DeleteCourseOut"/>
- <assign name="prepareReply">
- <copy>
- <from variable="DeleteCourseOut" part="success"/>
- <to variable="DeleteCourseOperationOut" part="success"/>
- </copy>
- </assign>
- <reply name="reply" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationOut"/>
+ <scope name="deleteCourseScope">
+ <faultHandlers>
+ <catch faultName="sxeh:systemFault">
+ <sequence>
+ <assign>
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('***SystemFault was handled by DeleteCourse.bpel: ', ' ')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from variable="DeleteCourseIn" part="course_id"/>
+ <to variable="deleteCourseFault" part="courseID"/>
+ </copy>
+ </assign>
+ <throw faultName="ns0:deleteCourseFailedSystemFault" faultVariable="deleteCourseFault"/>
+ </sequence>
+ </catch>
+ <catchAll>
+ <sequence>
+ <assign>
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('*** Some other Fault was handled by DeleteCourse.Bpel: ', ' ')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from variable="DeleteCourseIn" part="course_id"/>
+ <to variable="deleteCourseFault" part="courseID"/>
+ </copy>
+ </assign>
+ <throw faultName="ns0:deleteCourseFailedUnknownFault" faultVariable="deleteCourseFault"/>
+ </sequence>
+ </catchAll>
+ </faultHandlers>
+ <sequence>
+ <receive name="start" createInstance="yes" partnerLink="IliasAdapter" operation="deleteCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse" portType="tns:DeleteCoursePortType" variable="DeleteCourseOperationIn"/>
+ <assign name="prepareForDeleteCourse">
+ <copy>
+ <from variable="DeleteCourseOperationIn" part="SID"/>
+ <to variable="DeleteCourseIn" part="sid"/>
+ </copy>
+ <copy>
+ <from>177</from>
+ <to variable="DeleteCourseIn" part="course_id"/>
+ </copy>
+ </assign>
+ <invoke name="deleteCourseInvoke" partnerLink="ILIAS" operation="deleteCourse" xmlns:tns="urn:ilUserAdministration" portType="tns:ILIASSoapWebservicePortType" inputVariable="DeleteCourseIn" outputVariable="DeleteCourseOut"/>
+ <if name="IfDeleteCourseSucceed">
+ <condition>$DeleteCourseOut.success</condition>
+ <sequence name="Sequence1">
+ <assign name="prepareReply">
+ <copy>
+ <from variable="DeleteCourseOut" part="success"/>
+ <to variable="DeleteCourseOperationOut" part="success"/>
+ </copy>
+ </assign>
+ <reply name="reply" partnerLink="IliasAdapter" operation="deleteCourse" portType="ns0:DeleteCoursePortType" variable="DeleteCourseOperationOut"/>
+ </sequence>
+ <else>
+ <sequence name="Sequence2">
+ <assign name="Assign1">
+ <copy>
+ <from variable="DeleteCourseIn" part="course_id"/>
+ <to variable="deleteCourseFault" part="courseID"/>
+ </copy>
+ </assign>
+ <throw name="Throw1" faultName="ns0:deleteCourseFailedByIlias" faultVariable="deleteCourseFault"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+ </scope>
</sequence>
</process>
Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl 2009-06-18 10:50:18 UTC (rev 263)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/DeleteCourse.wsdl 2009-06-19 11:50:05 UTC (rev 264)
@@ -15,10 +15,16 @@
<message name="DeleteCourseResponse">
<part name="success" type="xsd:boolean"/>
</message>
+ <message name="deleteCourseFaultMessage">
+ <part name="courseID" type="xsd:int"/>
+ </message>
<portType name="DeleteCoursePortType">
<operation name="deleteCourse">
<input name="input1" message="tns:DeleteCourseRequest"/>
<output name="output1" message="tns:DeleteCourseResponse"/>
+ <fault name="deleteCourseFailedSystemFault" message="tns:deleteCourseFaultMessage"/>
+ <fault name="deleteCourseFailedUnknownFault" message="tns:deleteCourseFaultMessage"/>
+ <fault name="deleteCourseFailedByIlias" message="tns:deleteCourseFaultMessage"/>
</operation>
</portType>
<plnk:partnerLinkType name="DeleteCourse">
Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-06-18 10:50:18 UTC (rev 263)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/src/OutboundClientAdapter.bpel 2009-06-19 11:50:05 UTC (rev 264)
@@ -15,7 +15,7 @@
xmlns:il_crs="http://cse.campussource.de/schema/ilias/course"
xmlns:il_objs="http://cse.campussource.de/schema/ilias/objects"
xmlns:dt="http://cse.campussource.de/schema/DataTypes"
- xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns1="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory">
+ xmlns:tns="http://cse.campussource.de/bpel/ILIASClientAdapter/OutboundClientAdapter" xmlns:ns1="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" xmlns:ns2="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCourse">
<import namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing" location="Common/WS-Addressing.xsd" importType="http://www.w3.org/2001/XMLSchema"/>
<import namespace="http://cse.campussource.de/schema/DataTypes" location="Common/CDDM.xsd" importType="http://www.w3.org/2001/XMLSchema"/>
@@ -92,8 +92,7 @@
<!-- For testing -->
<variable name="ReplyXML" type="xsd:string"/>
- <!-- For Fault Handling -->
- <variable name="DeleteCategoryFault" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/DeleteCategory" messageType="tns:deleteCategoryRequest" />
+
</variables>
<sequence>
@@ -102,7 +101,63 @@
<onMessage partnerLink="ILIASAdapter" operation="processCourse" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"
portType="tns:ILIASClientAdapterPortType"
variable="ProcessCourseOperationIn">
- <sequence>
+
+ <scope name="CourseScope">
+ <faultHandlers>
+ <catch faultName="ns2:deleteCourseFailedSystemFault" faultVariable="faultData" faultMessageType="ns2:deleteCourseFaultMessage">
+ <assign>
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('*** SystemFault came from: ', 'deleteCourse.bpel')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from>$STATUS_FAILURE</from>
+ <to>$ReplyStatus</to>
+ </copy>
+ </assign>
+ </catch>
+ <catch faultName="ns2:deleteCourseFailedByIlias" faultVariable="faultData" faultMessageType="ns2:deleteCourseFaultMessage">
+ <assign>
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('*** Delte course Failde By Ilias came from: ', 'deleteCourse.bpel')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from>$STATUS_FAILURE</from>
+ <to>$ReplyStatus</to>
+ </copy>
+ </assign>
+ </catch>
+ <catch faultName="ns2:deleteCourseFailedUnknownFault" faultVariable="faultData" faultMessageType="ns2:deleteCourseFaultMessage">
+ <assign>
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('*** Unknown Fault came from: ', 'deleteCourse.bpel')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from>$STATUS_FAILURE</from>
+ <to>$ReplyStatus</to>
+ </copy>
+ </assign>
+ </catch>
+ <catchAll>
+ <assign >
+ <sxt:trace>
+ <sxt:log level="info" location="onStart">
+ <from>concat('*** Strange Fault came from: ', 'deleteCourse')</from>
+ </sxt:log>
+ </sxt:trace>
+ <copy>
+ <from>$STATUS_FAILURE</from>
+ <to>$ReplyStatus</to>
+ </copy>
+ </assign>
+ </catchAll>
+ </faultHandlers>
+ <sequence>
<assign name="prepareLoginForCourses">
<copy>
<from>'dummy'</from>
@@ -258,23 +313,15 @@
portType="tns:DeleteCoursePortType"
inputVariable="DeleteCourseIn"
outputVariable="DeleteCourseOut"/>
- <if>
- <condition>$DeleteCourseOut.success</condition>
+
<assign name="deleteCourseSuccess">
<copy>
<from>$STATUS_SUCCESS</from>
<to>$ReplyStatus</to>
</copy>
- </assign>
- <else>
- <assign name="deleteCourseFailure">
- <copy>
- <from>$STATUS_FAILURE</from>
- <to>$ReplyStatus</to>
- </copy>
- </assign>
- </else>
- </if>
+ </assign>
+
+
</sequence>
</elseif>
<else>
@@ -287,15 +334,17 @@
</sxt:trace>
</empty>
</else>
- </if>
- </sequence>
+ </if>
+ </sequence>
+ </scope>
+
</onMessage>
<onMessage partnerLink="ILIASAdapter" operation="processCategory" xmlns:tns="http://j2ee.netbeans.org/wsdl/ILIASClientAdapter/ILIASClientAdapter"
portType="tns:ILIASClientAdapterPortType"
variable="ProcessCategoryOperationIn">
<scope name="CategoryScope">
<faultHandlers>
- <catch faultName="ns1:deleteCategoryFailedSystemFault">
+ <catch faultName="ns1:deleteCategoryFailedSystemFault" faultVariable="faultString" faultMessageType="ns1:faultMessage">
<sequence>
<assign >
<sxt:trace>
@@ -310,7 +359,7 @@
</assign>
</sequence>
</catch>
- <catch faultName="ns1:deleteCategoryFailedByIlias" faultVariable="DeleteCategoryFault" faultMessageType="ns1:deleteCategoryRequest">
+ <catch faultName="ns1:deleteCategoryFailedByIlias">
<sequence>
<assign >
<sxt:trace>
@@ -325,7 +374,7 @@
</assign>
</sequence>
</catch>
- <catch faultName="ns1:deleteCategoryFailedUnknownFault" faultVariable="DeleteCategoryFault" faultMessageType="ns1:deleteCategoryRequest">
+ <catch faultName="ns1:deleteCategoryFailedUnknownFault">
<sequence>
<assign >
<sxt:trace>
@@ -340,7 +389,7 @@
</assign>
</sequence>
</catch>
- <!-- <catchAll>
+ <catchAll>
<sequence>
<assign >
<sxt:trace>
@@ -354,7 +403,7 @@
</copy>
</assign>
</sequence>
- </catchAll> -->
+ </catchAll>
</faultHandlers>
<sequence>
<assign name="prepareLoginForCategories">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
