Author: objectiser
Date: 2011-01-05 12:29:14 -0500 (Wed, 05 Jan 2011)
New Revision: 535
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel
Log:
All parser tests now working.
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05
17:29:14 UTC (rev 535)
@@ -42,12 +42,10 @@
suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer",
"PurchaseGoods@Buyer"));
suite.addTest(new
BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency",
"PurchaseGoods@CreditAgency"));
-
- /*
suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store",
"PurchaseGoods@Store"));
+
suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer",
"ReqRespFault@Buyer"));
suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller",
"ReqRespFault@Seller"));
- */
/**
* TODO: (SAVARA-150) Commenting out this test for now, as we now need the
accompanying WSDL to be able to
Deleted:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,13 +0,0 @@
-namespace null;
-
-conversation PurchaseGoodsProcess_Store@Store implements Purchasing@Store {
- buy(BuyRequest) from Buyer to Store;
- checkCredit(CreditCheckRequest) from Store to CreditAgency;
- if {
- checkCredit(CreditCheckOk) from CreditAgency to Store;
- buy(BuyConfirmed) from Store to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from CreditAgency to Store;
- buy(BuyFailed) from Store to Buyer;
- }
-}
\ No newline at end of file
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,12 @@
+protocol PurchaseGoodsProcess_Store @ StoreInterface {
+ buy(BuyRequest) from Buyer;
+ checkCredit(CreditCheckRequest) to CreditAgency;
+ choice from CreditAgency {
+ checkCredit(CreditCheckOk):
+ buy(BuyConfirmed) to Buyer;
+
+ checkCredit(CreditCheckInvalid):
+ buy(BuyFailed) to Buyer;
+
+ }
+}
Deleted:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation ReqRespFaultProcess_Buyer@Buyer implements LoanBroker@Buyer {
- checkCredit(CreditCheckRequest) from Buyer to Seller;
- if {
- checkCredit(CreditCheckOk) from Seller to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from Seller to Buyer;
- }
-}
\ No newline at end of file
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,9 @@
+protocol ReqRespFaultProcess_Buyer {
+ checkCredit(CreditCheckRequest) to Seller;
+ choice from Seller {
+ checkCredit(CreditCheckOk):
+
+ checkCredit(CreditCheckInvalid):
+
+ }
+}
Deleted:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation ReqRespFaultProcess_Seller@Seller implements ReqRespFaultProcess@Seller {
- checkCredit(CreditCheckRequest) from Buyer to Seller;
- if {
- checkCredit(CreditCheckOk) from Seller to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from Seller to Buyer;
- }
-}
\ No newline at end of file
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,9 @@
+protocol ReqRespFaultProcess_Seller @ SellerBehavior {
+ checkCredit(CreditCheckRequest) from Buyer;
+ choice to Buyer {
+ checkCredit(CreditCheckOk):
+
+ checkCredit(CreditCheckInvalid):
+
+ }
+}
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,32 +1,33 @@
-<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:pur="java:org.jboss.savara.examples.purchasing"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="savara.samples.Purchasing@Store"
name="PurchaseGoodsProcess_Store"
targetNamespace="http://www.jboss.org/examples/store"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_Store.wsdl"
namespace="http://www.jboss.org/examples/store"/>
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
namespace="java:org.jboss.savara.examples.purchasing"/>
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_StoreArtifacts.wsdl"
namespace="http://www.jboss.org/examples/store"/>
- <partnerLinks>
- <partnerLink myRole="StoreInterface" name="BuyerToStore"
partnerLinkType="sto:BuyerToStoreServiceLT"/>
- <partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
- </partnerLinks>
- <variables>
- <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
- <variable messageType="pur:checkCreditRequest"
name="checkCreditRequestVar"/>
- <variable messageType="pur:checkCreditResponse"
name="checkCreditResponseVar"/>
- <variable messageType="sto:buyResponse"
name="buyResponseVar"/>
- <variable messageType="sto:BuyFailedFault"
name="BuyFailedFaultVar"/>
- </variables>
- <sequence>
- <receive createInstance="yes" name="Receive_BuyRequest"
operation="buy" partnerLink="BuyerToStore"
portType="sto:StoreInterface" variable="buyRequestVar"/>
- <scope>
- <faultHandlers>
- <catch faultMessageType="pur:CreditCheckFailedFault"
faultName="pur:CreditCheckFailed"
faultVariable="CreditCheckFailedFaultVar">
- <sequence>
- <reply faultName="sto:BuyFailed"
name="Send_BuyFailed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="BuyFailedFaultVar"/>
- </sequence>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar"
name="Send_CreditCheckRequest" operation="checkCredit"
outputVariable="checkCreditResponseVar"
partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface"/>
- <reply name="Send_BuyConfirmed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="buyResponseVar"/>
- </sequence>
- </scope>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
name="PurchaseGoodsProcess_Store"
targetNamespace="http://www.jboss.org/examples/store">
+ <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_Store.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="java:org.jboss.savara.examples.purchasing"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_StoreArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToStore"
partnerLinkType="sto:BuyerToStoreServiceLT"
myRole="StoreInterface"/>
+ <partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable name="buyRequestVar"
messageType="sto:buyRequest"/>
+ <variable name="checkCreditRequestVar"
messageType="pur:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar"
messageType="pur:checkCreditResponse"/>
+ <variable name="buyResponseVar"
messageType="sto:buyResponse"/>
+ <variable name="BuyFailedFaultVar"
messageType="sto:BuyFailedFault"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="buyRequestVar" createInstance="yes"
name="Receive_BuyRequest"/>
+ <scope>
+ <faultHandlers>
+ <catch faultName="pur:CreditCheckFailed"
faultVariable="CreditCheckFailedFaultVar"
faultMessageType="pur:CreditCheckFailedFault">
+ <sequence>
+ <reply partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="BuyFailedFaultVar" faultName="sto:BuyFailed"
name="Send_BuyFailed"/>
+ </sequence>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface" operation="checkCredit"
inputVariable="checkCreditRequestVar"
outputVariable="checkCreditResponseVar"
name="Send_CreditCheckRequest"/>
+ <reply partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="buyResponseVar" name="Send_BuyConfirmed"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Copied:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
(from rev 531,
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel)
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,32 @@
+<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:pur="java:org.jboss.savara.examples.purchasing"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="savara.samples.Purchasing@Store"
name="PurchaseGoodsProcess_Store"
targetNamespace="http://www.jboss.org/examples/store"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_Store.wsdl"
namespace="http://www.jboss.org/examples/store"/>
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_StoreArtifacts.wsdl"
namespace="http://www.jboss.org/examples/store"/>
+ <partnerLinks>
+ <partnerLink myRole="StoreInterface" name="BuyerToStore"
partnerLinkType="sto:BuyerToStoreServiceLT"/>
+ <partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="sto:buyResponse"
name="buyResponseVar"/>
+ <variable messageType="sto:BuyFailedFault"
name="BuyFailedFaultVar"/>
+ </variables>
+ <sequence>
+ <receive createInstance="yes" name="Receive_BuyRequest"
operation="buy" partnerLink="BuyerToStore"
portType="sto:StoreInterface" variable="buyRequestVar"/>
+ <scope>
+ <faultHandlers>
+ <catch faultMessageType="pur:CreditCheckFailedFault"
faultName="pur:CreditCheckFailed"
faultVariable="CreditCheckFailedFaultVar">
+ <sequence>
+ <reply faultName="sto:BuyFailed"
name="Send_BuyFailed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="BuyFailedFaultVar"/>
+ </sequence>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke inputVariable="checkCreditRequestVar"
name="Send_CreditCheckRequest" operation="checkCredit"
outputVariable="checkCreditResponseVar"
partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface"/>
+ <reply name="Send_BuyConfirmed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="buyResponseVar"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,23 +1,24 @@
-<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer"
name="ReqRespFaultProcess_Buyer"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_Seller.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_BuyerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
- <partnerLinks>
- <partnerLink name="BuyerToSeller"
partnerLinkType="byr:BuyerToSellerLT"
partnerRole="SellerRequester"/>
- </partnerLinks>
- <variables>
- <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
- <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
- </variables>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="slr:insufficientCreditFault"
faultName="slr:insufficientCredit"
faultVariable="insufficientCreditFaultVar">
- <sequence/>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar"
name="Send_CreditCheckRequest" operation="checkCredit"
outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller"
portType="slr:SellerBehavior"/>
- </sequence>
- </scope>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
name="ReqRespFaultProcess_Buyer"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer">
+ <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_Seller.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import
namespace="http://www.pi4soa.org/ReqRespFault/Buyer"
location="ReqRespFaultProcess_BuyerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller"
partnerLinkType="byr:BuyerToSellerLT"
partnerRole="SellerRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable name="checkCreditRequestVar"
messageType="slr:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar"
messageType="slr:checkCreditResponse"/>
+ </variables>
+ <sequence>
+ <scope>
+ <faultHandlers>
+ <catch faultName="slr:insufficientCredit"
faultVariable="insufficientCreditFaultVar"
faultMessageType="slr:insufficientCreditFault">
+ <sequence/>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
inputVariable="checkCreditRequestVar"
outputVariable="checkCreditResponseVar"
name="Send_CreditCheckRequest"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Copied:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
(from rev 531,
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel)
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,23 @@
+<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer"
name="ReqRespFaultProcess_Buyer"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_Seller.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_BuyerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller"
partnerLinkType="byr:BuyerToSellerLT"
partnerRole="SellerRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
+ </variables>
+ <sequence>
+ <scope>
+ <faultHandlers>
+ <catch faultMessageType="slr:insufficientCreditFault"
faultName="slr:insufficientCredit"
faultVariable="insufficientCreditFaultVar">
+ <sequence/>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke inputVariable="checkCreditRequestVar"
name="Send_CreditCheckRequest" operation="checkCredit"
outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller"
portType="slr:SellerBehavior"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel 2011-01-05
17:12:54 UTC (rev 534)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel 2011-01-05
17:29:14 UTC (rev 535)
@@ -1,25 +1,26 @@
-<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller"
name="ReqRespFaultProcess_Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_Seller.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
- <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_SellerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
- <partnerLinks>
- <partnerLink myRole="SellerBehavior" name="BuyerToSeller"
partnerLinkType="slr:BuyerToSellerServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
- <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
- <variable messageType="slr:insufficientCreditFault"
name="insufficientCreditFaultVar"/>
- </variables>
- <sequence>
- <receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="BuyerToSeller" portType="slr:SellerBehavior"
variable="checkCreditRequestVar"/>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk"
operation="checkCredit" partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="slr:insufficientCredit"
name="Send_CreditCheckInvalid" operation="checkCredit"
partnerLink="BuyerToSeller" portType="slr:SellerBehavior"
variable="insufficientCreditFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
name="ReqRespFaultProcess_Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller">
+ <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_Seller.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_SellerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller"
partnerLinkType="slr:BuyerToSellerServiceLT"
myRole="SellerBehavior"/>
+ </partnerLinks>
+ <variables>
+ <variable name="checkCreditRequestVar"
messageType="slr:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar"
messageType="slr:checkCreditResponse"/>
+ <variable name="insufficientCreditFaultVar"
messageType="slr:insufficientCreditFault"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="checkCreditRequestVar" createInstance="yes"
name="Receive_CreditCheckRequest"/>
+ <if>
+ <sequence>
+ <reply partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="insufficientCreditFaultVar"
faultName="slr:insufficientCredit"
name="Send_CreditCheckInvalid"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
Copied:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
(from rev 531,
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel)
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD 2011-01-05
17:29:14 UTC (rev 535)
@@ -0,0 +1,25 @@
+<process
xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable...
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller"
name="ReqRespFaultProcess_Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_Seller.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="ReqRespFaultProcess_SellerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <partnerLinks>
+ <partnerLink myRole="SellerBehavior" name="BuyerToSeller"
partnerLinkType="slr:BuyerToSellerServiceLT"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="slr:insufficientCreditFault"
name="insufficientCreditFaultVar"/>
+ </variables>
+ <sequence>
+ <receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="BuyerToSeller" portType="slr:SellerBehavior"
variable="checkCreditRequestVar"/>
+ <if>
+ <sequence>
+ <reply name="Send_CreditCheckOk"
operation="checkCredit" partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" variable="checkCreditResponseVar"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply faultName="slr:insufficientCredit"
name="Send_CreditCheckInvalid" operation="checkCredit"
partnerLink="BuyerToSeller" portType="slr:SellerBehavior"
variable="insufficientCreditFaultVar"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>