Author: lwaterman
Date: Tue Sep 19 21:37:09 2006
New Revision: 448060
URL: http://svn.apache.org/viewvc?view=rev&rev=448060
Log:
Add fault handler test
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/test.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity/TestActivityFlow.wsdl
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/deploy.xml?view=auto&rev=448060
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/deploy.xml
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/deploy.xml
Tue Sep 19 21:37:09 2006
@@ -0,0 +1,12 @@
+<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
+ xmlns:pns="http://ode/bpel/unit-test/testFaultHandlers";
+ xmlns:wns="http://ode/bpel/unit-test/testFaultHandlers.wsdl";>
+
+
+ <process name="pns:TestFaultHandlersProcess">
+ <active>true</active>
+ <provide partnerLink="request">
+ <service name="wns:testFaultHandlersService"
port="wns:testFaultHandlersPort"/>
+ </provide>
+ </process>
+</deploy>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/test.properties?view=auto&rev=448060
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/test.properties
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/test.properties
Tue Sep 19 21:37:09 2006
@@ -0,0 +1,9 @@
+namespace=http://ode/bpel/unit-test/testFaultHandlers.wsdl
+service=testFaultHandlersService
+operation=request
+request1=<message><requestID>Start Test2.1</requestID><requestText>Event Start
Test2.1</requestText><faultIndicator1>yes</faultIndicator1><faultIndicator2>no</faultIndicator2></message>
+response1=.*Event Start Test2.1 -> throw testFault -> caught testFault
-> process complete.*
+request2=<message><requestID>Start Test2.2</requestID><requestText>Event Start
Test2.2</requestText><faultIndicator1>no</faultIndicator1><faultIndicator2>yes</faultIndicator2></message>
+response2=.*Event Start Test2.2 -> throw unknown fault -> caught fault
with catchAll.*
+request3=<message><requestID>Start Test2.3</requestID><requestText>Event Start
Test2.3</requestText><faultIndicator1>no</faultIndicator1><faultIndicator2>no</faultIndicator2></message>
+response3=.*Event Start Test2.3 -> process complete.*
\ No newline at end of file
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel?view=auto&rev=448060
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel
Tue Sep 19 21:37:09 2006
@@ -0,0 +1,217 @@
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testFaultHandlers";
+ xmlns:wns="http://ode/bpel/unit-test/testFaultHandlers.wsdl";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ name="TestFaultHandlersProcess"
+ targetNamespace="http://ode/bpel/unit-test/testFaultHandlers";
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <import location="testFaultHandlers.wsdl"
+ namespace="http://ode/bpel/unit-test/testFaultHandlers.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+ <import location="../ProbeService/probeService.wsdl"
+ namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+<!-- Unit test fault handlers -->
+<!-- throw -->
+<!-- catch -->
+<!-- catchAll -->
+
+ <partnerLinks>
+ <partnerLink name="request"
partnerLinkType="wns:testFaultHandlersRequest"
myRole="testFaultHandlersService"/>
+ <partnerLink name="probe" partnerLinkType="wns:probeRequest"
partnerRole="probeService" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request"
+ messageType="wns:requestMessage"/>
+ <variable name="probeInput"
+ messageType="prb:probeMessage"/>
+ <variable name="reply"
+ messageType="wns:replyMessage"/>
+ </variables>
+
+ <faultHandlers>
+ <catchAll>
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[caught fault with
catchAll]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="allFaultProbe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <!-- copy internal accumulators to the reply message -->
+
+ <assign name="allFaultAssign">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+
+ <reply name="allFaultReply" partnerLink="request"
portType="wns:testFaultHandlersPT"
+ operation="request" variable="reply">
+ </reply>
+ </sequence>
+ </catchAll>
+ </faultHandlers>
+
+ <sequence>
+
+ <receive name="receive1" partnerLink="request"
+ portType="wns:testFaultHandlersPT"
+ operation="request" variable="request"
+ createInstance="yes">
+ </receive>
+
+ <!-- Copy input variables to internal accumulators -->
+
+ <assign name="assign1">
+ <copy>
+ <from variable="request" part="requestID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" part="requestText"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+
+ <scope name="scopeOne">
+ <faultHandlers>
+ <catch faultName="tns:testFault">
+ <sequence>
+
+ <assign>
+ <copy>
+ <from>
+
<literal><![CDATA[caught testFault]]></literal>
+ </from>
+ <to variable="probeInput"
part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="testFaultProbe"
partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <!-- copy internal accumulators to the
reply message -->
+
+ <assign name="testFaultAssign">
+ <copy>
+ <from
variable="probeInput" part="probeName"/>
+ <to variable="reply"
part="replyID"/>
+ </copy>
+ <copy>
+ <from
variable="probeInput" part="probeData"/>
+ <to variable="reply"
part="replyText"/>
+ </copy>
+ </assign>
+
+ </sequence>
+ </catch>
+ </faultHandlers>
+
+ <if>
+ <!-- throws a named fault -->
+ <condition>$request.faultIndicator1 = 'yes'</condition>
+ <then>
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[throw
testFault]]></literal>
+ </from>
+ <to variable="probeInput"
part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe1" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+ <throw faultName="tns:testFault"/>
+ </sequence>
+ </then>
+ <!-- throws an unknown fault -->
+ <elseif>
+ <condition>$request.faultIndicator2 = 'yes'</condition>
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[throw
unknown fault]]></literal>
+ </from>
+ <to variable="probeInput"
part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe1" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <throw faultName="tns:unknownFault"/>
+ </sequence>
+ </elseif>
+ </if>
+ </scope>
+
+ <assign>
+ <copy>
+ <from>
+
<literal><![CDATA[process complete]]></literal>
+ </from>
+ <to variable="probeInput"
part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe2" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <!-- copy internal accumulators to the reply message -->
+
+ <assign name="assign2">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+
+ <reply name="reply" partnerLink="request"
portType="wns:testFaultHandlersPT"
+ operation="request" variable="reply">
+ </reply>
+
+
+ </sequence>
+</process>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl?view=auto&rev=448060
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl
Tue Sep 19 21:37:09 2006
@@ -0,0 +1,48 @@
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test/testFaultHandlers.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testFaultHandlers.wsdl";
+ xmlns="http://ode/bpel/unit-test/testFaultHandlers.wsdl";
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+
+ <wsdl:message name="requestMessage">
+ <wsdl:part name="requestID" type="xsd:string"/>
+ <wsdl:part name="requestText" type="xsd:string"/>
+ <wsdl:part name="faultIndicator1" type="xsd:string"/>
+ <wsdl:part name="faultIndicator2" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="replyMessage">
+ <wsdl:part name="replyID" type="xsd:string"/>
+ <wsdl:part name="replyText" type="xsd:string"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="testFaultHandlersPT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ <wsdl:output message="replyMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="testFaultHandlersBinding"
type="tns:testFaultHandlersPT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="testFaultHandlersService">
+ <wsdl:port name="testFaultHandlersPort"
binding="tns:testFaultHandlersBinding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="testFaultHandlersRequest">
+ <plnk:role name="testFaultHandlersService"
portType="testFaultHandlersPT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="probeRequest">
+ <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+ </plnk:partnerLinkType>
+
+</wsdl:definitions>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity/TestActivityFlow.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity/TestActivityFlow.wsdl?view=diff&rev=448060&r1=448059&r2=448060
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity/TestActivityFlow.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity/TestActivityFlow.wsdl
Tue Sep 19 21:37:09 2006
@@ -1,4 +1,3 @@
-<!-- The public service interface for test1.bpel -->
<wsdl:definitions
targetNamespace="http://ode/bpel/unit-test/testFlowActivity.wsdl";
