January 2011 - savara-commits - Jboss List Archives

savara SVN: r534 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/parser and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-05 12:12:54 -0500 (Wed, 05 Jan 2011) New Revision: 534 Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD Removed: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ 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/CompleteTransaction_SupplierTxnProcessor.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel Log: Update further testcases. 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 16:17:24 UTC (rev 533) +++ 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) @@ -34,15 +34,16 @@ TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests"); suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); - + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); - /* suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); + 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")); Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv 2011-01-05 17:12:54 UTC (rev 534) @@ -1,6 +0,0 @@ -namespace null; - -conversation RequestForQuote_SupplierQuoteEngine@SupplierQuoteEngine implements LoanBroker@SupplierQuoteEngine { - getQuote(requestForQuote) from Broker to SupplierQuoteEngine; - getQuote(quote) from SupplierQuoteEngine to Broker; -} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.spr 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,4 @@ +protocol RequestForQuote_SupplierQuoteEngine @ SupplierBehavior { + getQuote(requestForQuote) from Broker; + getQuote(quote) to Broker; +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv 2011-01-05 17:12:54 UTC (rev 534) @@ -1,8 +0,0 @@ -namespace null; - -conversation CompleteTransaction_SupplierTxnProcessor@SupplierTxnProcessor implements LoanBroker@SupplierTxnProcessor { - if { - confirm(orderConfirmed) from Broker to SupplierTxnProcessor; - confirm(bookingReference) from SupplierTxnProcessor to Broker; - } -} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.spr 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,4 @@ +protocol CompleteTransaction_SupplierTxnProcessor @ SupplierTxnProcessor { + confirm(orderConfirmed) from Broker; + confirm(bookingReference) to Broker; +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv 2011-01-05 17:12:54 UTC (rev 534) @@ -1,10 +0,0 @@ -namespace null; - -conversation PurchaseGoodsProcess_Buyer@Buyer implements Purchasing@Buyer { - buy(BuyRequest) from Buyer to Store; - if { - buy(BuyConfirmed) from Store to Buyer; - } else if { - 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)Buyer.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.spr 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,9 @@ +protocol PurchaseGoodsProcess_Buyer @ Buyer { + buy(BuyRequest) to Store; + choice from Store { + buy(BuyConfirmed): + + buy(BuyFailed): + + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv 2011-01-05 17:12:54 UTC (rev 534) @@ -1,10 +0,0 @@ -namespace null; - -conversation PurchaseGoodsProcess_CreditAgency@CreditAgency implements Common@CreditAgency { - checkCredit(CreditCheckRequest) from Store to CreditAgency; - if { - checkCredit(CreditCheckOk) from CreditAgency to Store; - } else if { - checkCredit(CreditCheckInvalid) from CreditAgency to Store; - } -} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.spr 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,9 @@ +protocol PurchaseGoodsProcess_CreditAgency @ CreditAgencyInterface { + checkCredit(CreditCheckRequest) from Store; + choice to Store { + checkCredit(CreditCheckOk): + + checkCredit(CreditCheckInvalid): + + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel 2011-01-05 17:12:54 UTC (rev 534) @@ -1,20 +1,16 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <partnerLinks> - <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> - <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> - </variables> - <sequence> - <pick createInstance="yes"> - <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar"> - <sequence> - <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/> - </sequence> - </onMessage> - </pick> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" myRole="SupplierTxnProcessor"/> + </partnerLinks> + <variables> + <variable name="confirmRequestVar" messageType="spr:confirmRequest"/> + <variable name="confirmResponseVar" messageType="spr:confirmResponse"/> + </variables> + <sequence> + <receive partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmRequestVar" createInstance="yes" name="Receive_orderConfirmed"/> + <reply partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmResponseVar" name="Send_bookingReference"/> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,20 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <partnerLinks> + <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> + <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> + </variables> + <sequence> + <pick createInstance="yes"> + <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar"> + <sequence> + <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/> + </sequence> + </onMessage> + </pick> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel 2011-01-05 17:12:54 UTC (rev 534) @@ -1,24 +1,25 @@ -<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@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/> - <partnerLinks> - <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> - </partnerLinks> - <variables> - <variable messageType="sto:buyRequest" name="buyRequestVar"/> - <variable messageType="sto:buyResponse" name="buyResponseVar"/> - </variables> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/> - </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_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <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_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.jboss.org/savara/examples" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BuyerToStore" myRole="Buyer" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> + </partnerLinks> + <variables> + <variable name="buyRequestVar" messageType="sto:buyRequest"/> + <variable name="buyResponseVar" messageType="sto:buyResponse"/> + </variables> + <sequence> + <scope> + <faultHandlers> + <catch faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar" faultMessageType="sto:BuyFailedFault"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_BuyRequest"/> + </sequence> + </scope> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,24 @@ +<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@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/> + <partnerLinks> + <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> + </partnerLinks> + <variables> + <variable messageType="sto:buyRequest" name="buyRequestVar"/> + <variable messageType="sto:buyResponse" name="buyResponseVar"/> + </variables> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/> + </sequence> + </scope> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel 2011-01-05 17:12:54 UTC (rev 534) @@ -1,26 +1,27 @@ -<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.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> - <partnerLinks> - <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> - </variables> - <sequence> - <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/> - <if> - <sequence> - <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/> - </sequence> - <else> - <sequence> - <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/> - </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.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_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing"> + <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_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" myRole="CreditAgencyInterface"/> + </partnerLinks> + <variables> + <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/> + <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/> + <variable name="CreditCheckFailedFaultVar" messageType="pur:CreditCheckFailedFault"/> + </variables> + <sequence> + <receive partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/> + <if> + <sequence> + <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/> + </sequence> + <else> + <sequence> + <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,26 @@ +<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.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <partnerLinks> + <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> + </variables> + <sequence> + <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/> + <if> + <sequence> + <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/> + </sequence> + <else> + <sequence> + <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/> + </sequence> + </else> + </if> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel 2011-01-05 16:17:24 UTC (rev 533) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel 2011-01-05 17:12:54 UTC (rev 534) @@ -1,15 +1,16 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <partnerLinks> - <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> - <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> - </variables> - <sequence> - <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/> - <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngine.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" myRole="SupplierBehavior"/> + </partnerLinks> + <variables> + <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/> + <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/> + </variables> + <sequence> + <receive partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteRequestVar" createInstance="yes" name="Receive_requestForQuote"/> + <reply partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteResponseVar" name="Send_quote"/> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD 2011-01-05 17:12:54 UTC (rev 534) @@ -0,0 +1,15 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <partnerLinks> + <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> + <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> + </variables> + <sequence> + <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/> + <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/> + </sequence> +</process>

13 years, 4 months

1
0
0 / 0

savara SVN: r533 - in branches/experimental/2.0.x/bundles: org.savara.bpel/src/main/java/org/savara/bpel/parser and 5 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-05 11:17:24 -0500 (Wed, 05 Jan 2011) New Revision: 533 Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelex branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileParserRule.java Removed: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/generator/ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/OnMessageGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileGenerationRule.java 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/results/ESBBroker(a)Broker.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/TypeReferenceUtil.java Log: Changed parser rules to be packaged under the parser, rather than the generator, as this was confusing. Also sorted out the third parser test. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-05 16:17:24 UTC (rev 533) @@ -20,8 +20,9 @@ package org.savara.bpel.parser; import org.savara.bpel.BPELDefinitions; -import org.savara.bpel.generator.protocol.DefaultConversionContext; +import org.savara.bpel.model.TPartnerLink; import org.savara.bpel.model.TProcess; +import org.savara.bpel.parser.rules.DefaultConversionContext; import org.savara.bpel.util.BPELModelUtil; import org.scribble.common.resource.ResourceLocator; import org.scribble.common.logging.Journal; @@ -59,6 +60,17 @@ //String convType=getConversationType(); String role=null; + // Search the partner links to see if a 'myRole' has been defined + if (process.getPartnerLinks() != null) { + for (TPartnerLink pl : process.getPartnerLinks().getPartnerLink()) { + if (pl.getMyRole() != null && pl.getMyRole().trim().length() > 0) { + role = pl.getMyRole(); + protocol.setRole(new Role(role)); + break; + } + } + } + // Convert the process contents DefaultConversionContext context=new DefaultConversionContext(role, process, locator); Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol) Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,101 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import org.savara.bpel.model.TProcess; -import org.savara.bpel.model.TScope; -import org.savara.bpel.model.TVariable; -import org.scribble.common.resource.ResourceLocator; -import org.scribble.protocol.model.Activity; - -public interface ConversionContext { - - /** - * This method applies the conversion process to the supplied component. - * - * @param component The domain component - * @param activities The list of protocol activities to place the conversion results - */ - public void convert(Object component, java.util.List<Activity> activities); - - /** - * This method returns a reference to the resource locator. - * - * @return The resource locator - */ - public ResourceLocator getResourceLocator(); - - /** - * This method returns the process. - * - * @return The process - */ - public TProcess getProcess(); - - /** - * This method returns the role associated with the - * endpoint being converted. - * - *@return The role - */ - public String getRole(); - - /** - * This method returns the variable associated with the - * supplied name. - * - * @param name The name - * @return The variable, or null if not found - */ - public TVariable getVariable(String name); - - /** - * This method adds a variable to the context. - * - * @param var The variable - */ - public void addVariable(TVariable var); - - /** - * This method removes a variable from the context. - * - * @param var The variable - */ - public void removeVariable(TVariable var); - - /** - * This method pushes the supplied scope on the stack. - * - * @param scope The scope - */ - public void pushScope(TScope scope); - - /** - * This method pops the top scope from the stack. - * - */ - public void popScope(); - - /** - * This method returns the current scope. - * - * @return The scope, or null if not within a scope - */ - public TScope getScope(); - -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,102 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import org.savara.bpel.model.TProcess; +import org.savara.bpel.model.TScope; +import org.savara.bpel.model.TVariable; +import org.scribble.common.logging.Journal; +import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.model.Activity; + +public interface ConversionContext { + + /** + * This method applies the conversion process to the supplied component. + * + * @param component The domain component + * @param activities The list of protocol activities to place the conversion results + */ + public void convert(Object component, java.util.List<Activity> activities, Journal journal); + + /** + * This method returns a reference to the resource locator. + * + * @return The resource locator + */ + public ResourceLocator getResourceLocator(); + + /** + * This method returns the process. + * + * @return The process + */ + public TProcess getProcess(); + + /** + * This method returns the role associated with the + * endpoint being converted. + * + *@return The role + */ + public String getRole(); + + /** + * This method returns the variable associated with the + * supplied name. + * + * @param name The name + * @return The variable, or null if not found + */ + public TVariable getVariable(String name); + + /** + * This method adds a variable to the context. + * + * @param var The variable + */ + public void addVariable(TVariable var); + + /** + * This method removes a variable from the context. + * + * @param var The variable + */ + public void removeVariable(TVariable var); + + /** + * This method pushes the supplied scope on the stack. + * + * @param scope The scope + */ + public void pushScope(TScope scope); + + /** + * This method pops the top scope from the stack. + * + */ + public void popScope(); + + /** + * This method returns the current scope. + * + * @return The scope, or null if not within a scope + */ + public TScope getScope(); + +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,174 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import org.savara.bpel.model.TProcess; -import org.savara.bpel.model.TScope; -import org.savara.bpel.model.TVariable; -import org.scribble.common.resource.ResourceLocator; -import org.scribble.protocol.model.Activity; - -/** - * This class provides a default implementation of the conversation - * context. - */ -public class DefaultConversionContext implements ConversionContext { - - private String m_role=null; - private TProcess m_process=null; - private ResourceLocator m_resourceLocator=null; - private java.util.Map<String,TVariable> m_variables= - new java.util.HashMap<String,TVariable>(); - private java.util.Stack<TScope> m_scopeStack=new java.util.Stack<TScope>(); - - private static java.util.List<ProtocolGenerationRule> m_rules= - new java.util.Vector<ProtocolGenerationRule>(); - - static { - m_rules.add(new ElseGenerationRule()); - m_rules.add(new ElseifGenerationRule()); - m_rules.add(new FlowGenerationRule()); - m_rules.add(new IfGenerationRule()); - m_rules.add(new InvokeGenerationRule()); - m_rules.add(new OnMessageGenerationRule()); - m_rules.add(new PickGenerationRule()); - m_rules.add(new ProcessGenerationRule()); - m_rules.add(new ReceiveGenerationRule()); - m_rules.add(new ReplyGenerationRule()); - m_rules.add(new ScopeGenerationRule()); - m_rules.add(new SequenceGenerationRule()); - m_rules.add(new WhileGenerationRule()); - } - - /** - * This is the constructor for the conversion context, initialised - * with the role being played by the converted BPEL process. - * - * @param role The role - * @param proc The process - * @param locator The resource locator - */ - public DefaultConversionContext(String role, TProcess proc, ResourceLocator locator) { - m_role = role; - m_process = proc; - m_resourceLocator = locator; - } - - /** - * This method applies the conversion process to the supplied component. - * - * @param component The domain component - * @param activities The list of protocol activities to place the conversion results - */ - public void convert(Object component, java.util.List<Activity> activities) { - ProtocolGenerationRule rule=null; - - for (int i=0; rule == null && i < m_rules.size(); i++) { - if (m_rules.get(i).isSupported(component)) { - rule = m_rules.get(i); - } - } - - if (rule != null) { - rule.convert(this, component, activities); - } - } - - /** - * This method returns a reference to the environment context. - * - * @return The environment context - */ - public ResourceLocator getResourceLocator() { - return(m_resourceLocator); - } - - /** - * This method returns the process. - * - * @return The process - */ - public TProcess getProcess() { - return(m_process); - } - - /** - * This method returns the role associated with the - * endpoint being converted. - * - *@return The role - */ - public String getRole() { - return(m_role); - } - - /** - * This method returns the variable associated with the - * supplied name. - * - * @param name The name - * @return The variable, or null if not found - */ - public TVariable getVariable(String name) { - return(m_variables.get(name)); - } - - /** - * This method adds a variable to the context. - * - * @param var The variable - */ - public void addVariable(TVariable var) { - m_variables.put(var.getName(), var); - } - - /** - * This method removes a variable from the context. - * - * @param var The variable - */ - public void removeVariable(TVariable var) { - m_variables.remove(var.getName()); - } - - /** - * This method pushes the supplied scope on the stack. - * - * @param scope The scope - */ - public void pushScope(TScope scope) { - m_scopeStack.push(scope); - } - - /** - * This method pops the top scope from the stack. - * - */ - public void popScope() { - m_scopeStack.pop(); - } - - /** - * This method returns the current scope. - * - * @return The scope, or null if not within a scope - */ - public TScope getScope() { - return(m_scopeStack.peek()); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,175 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import org.savara.bpel.model.TProcess; +import org.savara.bpel.model.TScope; +import org.savara.bpel.model.TVariable; +import org.scribble.common.logging.Journal; +import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.model.Activity; + +/** + * This class provides a default implementation of the conversation + * context. + */ +public class DefaultConversionContext implements ConversionContext { + + private String m_role=null; + private TProcess m_process=null; + private ResourceLocator m_resourceLocator=null; + private java.util.Map<String,TVariable> m_variables= + new java.util.HashMap<String,TVariable>(); + private java.util.Stack<TScope> m_scopeStack=new java.util.Stack<TScope>(); + + private static java.util.List<ProtocolParserRule> m_rules= + new java.util.Vector<ProtocolParserRule>(); + + static { + m_rules.add(new ElseParserRule()); + m_rules.add(new ElseifParserRule()); + m_rules.add(new FlowParserRule()); + m_rules.add(new IfParserRule()); + m_rules.add(new InvokeParserRule()); + //m_rules.add(new OnMessageGenerationRule()); + m_rules.add(new PickParserRule()); + m_rules.add(new ProcessParserRule()); + m_rules.add(new ReceiveParserRule()); + m_rules.add(new ReplyParserRule()); + m_rules.add(new ScopeParserRule()); + m_rules.add(new SequenceParserRule()); + m_rules.add(new WhileParserRule()); + } + + /** + * This is the constructor for the conversion context, initialised + * with the role being played by the converted BPEL process. + * + * @param role The role + * @param proc The process + * @param locator The resource locator + */ + public DefaultConversionContext(String role, TProcess proc, ResourceLocator locator) { + m_role = role; + m_process = proc; + m_resourceLocator = locator; + } + + /** + * This method applies the conversion process to the supplied component. + * + * @param component The domain component + * @param activities The list of protocol activities to place the conversion results + */ + public void convert(Object component, java.util.List<Activity> activities, Journal journal) { + ProtocolParserRule rule=null; + + for (int i=0; rule == null && i < m_rules.size(); i++) { + if (m_rules.get(i).isSupported(component)) { + rule = m_rules.get(i); + } + } + + if (rule != null) { + rule.convert(this, component, activities, journal); + } + } + + /** + * This method returns a reference to the environment context. + * + * @return The environment context + */ + public ResourceLocator getResourceLocator() { + return(m_resourceLocator); + } + + /** + * This method returns the process. + * + * @return The process + */ + public TProcess getProcess() { + return(m_process); + } + + /** + * This method returns the role associated with the + * endpoint being converted. + * + *@return The role + */ + public String getRole() { + return(m_role); + } + + /** + * This method returns the variable associated with the + * supplied name. + * + * @param name The name + * @return The variable, or null if not found + */ + public TVariable getVariable(String name) { + return(m_variables.get(name)); + } + + /** + * This method adds a variable to the context. + * + * @param var The variable + */ + public void addVariable(TVariable var) { + m_variables.put(var.getName(), var); + } + + /** + * This method removes a variable from the context. + * + * @param var The variable + */ + public void removeVariable(TVariable var) { + m_variables.remove(var.getName()); + } + + /** + * This method pushes the supplied scope on the stack. + * + * @param scope The scope + */ + public void pushScope(TScope scope) { + m_scopeStack.push(scope); + } + + /** + * This method pops the top scope from the stack. + * + */ + public void popScope() { + m_scopeStack.pop(); + } + + /** + * This method returns the current scope. + * + * @return The scope, or null if not within a scope + */ + public TScope getScope() { + return(m_scopeStack.size() > 0 ? m_scopeStack.peek() : null); + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TActivityContainer; -import org.savara.bpel.util.ActivityUtil; -import org.scribble.protocol.model.Activity; - -/** - * This class represents the 'else' construct contained - * within the 'if' activity. - */ -public class ElseGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TActivityContainer); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TActivityContainer container=(TActivityContainer)component; - - TActivity act=ActivityUtil.getActivity(container); - - if (act != null) { - context.convert(act, activities); - } - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TActivityContainer; +import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.Activity; + +/** + * This class represents the 'else' construct contained + * within the 'if' activity. + */ +public class ElseParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TActivityContainer); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TActivityContainer container=(TActivityContainer)component; + + TActivity act=ActivityUtil.getActivity(container); + + if (act != null) { + context.convert(act, activities, journal); + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TElseif; -import org.savara.bpel.util.ActivityUtil; -import org.scribble.protocol.model.Activity; - -/** - * This class represents the 'elseif' construct contained - * within the 'if' activity. - */ -public class ElseifGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TElseif); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TElseif container=(TElseif)component; - - TActivity act=ActivityUtil.getActivity(container); - - if (act != null) { - context.convert(act, activities); - } - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ElseifParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TElseif; +import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.Activity; + +/** + * This class represents the 'elseif' construct contained + * within the 'if' activity. + */ +public class ElseifParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TElseif); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TElseif container=(TElseif)component; + + TActivity act=ActivityUtil.getActivity(container); + + if (act != null) { + context.convert(act, activities, journal); + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TFlow; -import org.scribble.protocol.model.*; - -/** - * This class represents a flow grouping activity. - * - */ -public class FlowGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TFlow); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TFlow elem=(TFlow)component; - - //getSource().setComponentURI(getURI()); - - // If links have been defined, represent them as boolean - // variables that can be tested using a 'when' clause - - /* TODO: Basis for source link mechanism - but no variables - * supported yet - * - if (getLinks().size() > 0) { - org.scribble.conversation.model.VariableList vl= - new org.scribble.conversation.model.VariableList(); - - org.scribble.protocol.model.TypeReference tref= - new org.scribble.protocol.model.TypeReference(); - tref.setName("boolean"); - - vl.setType(tref); - - for (int i=0; i < getLinks().size(); i++) { - Link l=getLinks().get(i); - - org.scribble.conversation.model.Variable var= - new org.scribble.conversation.model.Variable(); - - var.setName(l.getName()); - - vl.getVariables().add(var); - } - - activities.add(vl); - } - */ - - org.scribble.protocol.model.Parallel parallel= - new org.scribble.protocol.model.Parallel(); - - for (int i=0; i < elem.getActivity().size(); i++) { - Block b=new Block(); - - context.convert(elem.getActivity().get(i), b.getContents()); - - parallel.getBlocks().add(b); - } - - activities.add(parallel); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/FlowParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TFlow; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a flow grouping activity. + * + */ +public class FlowParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TFlow); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TFlow elem=(TFlow)component; + + //getSource().setComponentURI(getURI()); + + // If links have been defined, represent them as boolean + // variables that can be tested using a 'when' clause + + /* TODO: Basis for source link mechanism - but no variables + * supported yet + * + if (getLinks().size() > 0) { + org.scribble.conversation.model.VariableList vl= + new org.scribble.conversation.model.VariableList(); + + org.scribble.protocol.model.TypeReference tref= + new org.scribble.protocol.model.TypeReference(); + tref.setName("boolean"); + + vl.setType(tref); + + for (int i=0; i < getLinks().size(); i++) { + Link l=getLinks().get(i); + + org.scribble.conversation.model.Variable var= + new org.scribble.conversation.model.Variable(); + + var.setName(l.getName()); + + vl.getVariables().add(var); + } + + activities.add(vl); + } + */ + + org.scribble.protocol.model.Parallel parallel= + new org.scribble.protocol.model.Parallel(); + + for (int i=0; i < elem.getActivity().size(); i++) { + Block b=new Block(); + + context.convert(elem.getActivity().get(i), b.getContents(), journal); + + parallel.getBlocks().add(b); + } + + activities.add(parallel); + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TElseif; -import org.savara.bpel.model.TIf; -import org.savara.bpel.util.ActivityUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents an 'if' grouping construct. - * - */ -public class IfGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TIf); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TIf bpelElem=(TIf)component; - - //getSource().setComponentURI(getURI()); - - org.scribble.protocol.model.Choice elem= - new org.scribble.protocol.model.Choice(); - - When cb=new When(); - - // TODO: Convert the conditional expression - - TActivity act=ActivityUtil.getActivity(bpelElem); - - if (act != null) { - context.convert(act, cb.getBlock().getContents()); - } - - elem.getWhens().add(cb); - - // Convert 'else if' paths - for (int i=0; i < bpelElem.getElseif().size(); i++) { - TElseif elseIfElem=bpelElem.getElseif().get(i); - - cb = new When(); - - context.convert(elseIfElem, cb.getBlock().getContents()); - - elem.getWhens().add(cb); - } - - // Convert 'else' path - if (bpelElem.getElse() != null) { - cb = new When(); - - context.convert(bpelElem.getElse(), cb.getBlock().getContents()); - - elem.getWhens().add(cb); - } - - activities.add(elem); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/IfParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,145 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TElseif; +import org.savara.bpel.model.TIf; +import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents an 'if' grouping construct. + * + */ +public class IfParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TIf); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TIf bpelElem=(TIf)component; + + //getSource().setComponentURI(getURI()); + + org.scribble.protocol.model.Choice elem= + new org.scribble.protocol.model.Choice(); + + When cb=new When(); + + // TODO: Convert the conditional expression + + TActivity act=ActivityUtil.getActivity(bpelElem); + + if (act != null) { + context.convert(act, cb.getBlock().getContents(), journal); + + // Check if first activity is interaction + if (cb.getBlock().getContents().size() > 0 && + cb.getBlock().getContents().get(0) instanceof Interaction) { + Interaction interaction=(Interaction)cb.getBlock().getContents().get(0); + + cb.getBlock().getContents().remove(0); + + cb.derivedFrom(interaction); + + cb.setMessageSignature(interaction.getMessageSignature()); + + elem.setFromRole(interaction.getFromRole()); + + if (interaction.getToRoles().size() > 0) { + elem.setToRole(interaction.getToRoles().get(0)); + } + } else { + journal.error("Main block of if does not contain an initial interaction", null); + } + } + + elem.getWhens().add(cb); + + // Convert 'else if' paths + for (int i=0; i < bpelElem.getElseif().size(); i++) { + TElseif elseIfElem=bpelElem.getElseif().get(i); + + cb = new When(); + + context.convert(elseIfElem, cb.getBlock().getContents(), journal); + + setupWhenMs(elem, cb, journal); + + elem.getWhens().add(cb); + } + + // Convert 'else' path + if (bpelElem.getElse() != null) { + cb = new When(); + + context.convert(bpelElem.getElse(), cb.getBlock().getContents(), journal); + + setupWhenMs(elem, cb, journal); + + elem.getWhens().add(cb); + } + + activities.add(elem); + } + + protected void setupWhenMs(Choice elem, When cb, Journal journal) { + + // Check if first activity is interaction + if (cb.getBlock().getContents().size() > 0 && + cb.getBlock().getContents().get(0) instanceof Interaction) { + Interaction interaction=(Interaction)cb.getBlock().getContents().get(0); + + cb.getBlock().getContents().remove(0); + + cb.derivedFrom(interaction); + + cb.setMessageSignature(interaction.getMessageSignature()); + + // Verify from/to roles + if (elem.getFromRole() != null) { + if (interaction.getFromRole() != null) { + if (elem.getFromRole().equals(interaction.getFromRole()) == false) { + journal.error("ElseIf path has interaction with incompatible 'from' role", null); + } + } else { + journal.error("ElseIf path does not contain a required 'from' role", null); + } + } + elem.setFromRole(interaction.getFromRole()); + + if (elem.getToRole() != null) { + if (interaction.getToRoles().size() > 0) { + if (elem.getToRole().equals(interaction.getToRoles().get(0)) == false) { + journal.error("ElseIf path has interaction with incompatible 'to' role", null); + } + } else { + journal.error("ElseIf path does not contain a required 'to' role", null); + } + } + } else { + journal.error("Main block of if does not contain an initial interaction", null); + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,229 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import javax.xml.namespace.QName; - -import org.savara.bpel.model.TCatch; -import org.savara.bpel.model.TInvoke; -import org.savara.bpel.model.TScope; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.InteractionUtil; -import org.savara.bpel.util.PartnerLinkUtil; -import org.savara.bpel.util.TypeReferenceUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents an unsupported (or custom) action within - * the conversation based ESB service descriptor. - * - */ -public class InvokeGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TInvoke); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TInvoke invoke=(TInvoke)component; - - //getSource().setComponentURI(getURI()); - - convertRequest(invoke, activities, context); - - // Check if invoke is contained within a scope that defines - // fault handlers. If so, then generate choice to throw - // fault exceptions. - TScope scope=context.getScope(); - - if (scope != null && scope.getFaultHandlers() != null && - (scope.getFaultHandlers().getCatch().size() > 0 || - scope.getFaultHandlers().getCatchAll() != null)) { - org.scribble.protocol.model.Choice te= - new org.scribble.protocol.model.Choice(); - //te.derivedFrom(this); - - activities.add(te); - - org.scribble.protocol.model.When when= - new org.scribble.protocol.model.When(); - te.getWhens().add(when); - - activities = when.getBlock().getContents(); - - for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { - TCatch catchBlock=scope.getFaultHandlers().getCatch().get(i); - - org.scribble.protocol.model.When fcb= - new org.scribble.protocol.model.When(); - - QName mesgType=catchBlock.getFaultMessageType(); - - if (mesgType == null) { - mesgType = catchBlock.getFaultElement(); - } - - TVariable faultVar=null; - - if (catchBlock.getFaultVariable() != null) { - faultVar = new TVariable(); - faultVar.setName(catchBlock.getFaultVariable()); - faultVar.setMessageType(catchBlock.getFaultMessageType()); - faultVar.setElement(catchBlock.getFaultElement()); - context.addVariable(faultVar); - } - - convertFaultResponse(invoke, fcb.getBlock().getContents(), catchBlock.getFaultVariable(), - mesgType, context); - - org.scribble.protocol.model.Raise raise= - new org.scribble.protocol.model.Raise(); - - TypeReference tref=new TypeReference(); - tref.setName(catchBlock.getFaultName().getLocalPart()); - raise.setType(tref); - - fcb.getBlock().add(raise); - - te.getWhens().add(fcb); - - if (faultVar != null) { - context.removeVariable(faultVar); - } - } - } - - if (invoke.getOutputVariable() != null) { - - convertResponse(invoke, activities, context); - } - } - - protected static void convertRequest(TInvoke invoke, java.util.List<Activity> activities, - ConversionContext context) { - // Create interaction for request - Interaction interaction=new Interaction(); - //interaction.derivedFrom(this); - - TVariable var=context.getVariable(invoke.getInputVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - ms.setOperation(invoke.getOperation()); - ms.getTypeReferences().add(tref); - - if (context.getRole() != null) { - interaction.setFromRole(new Role(context.getRole())); - } - - String toRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); - - if (toRole != null) { - interaction.getToRoles().add(new Role(toRole)); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - } - - protected static void convertResponse(TInvoke invoke, java.util.List<Activity> activities, - ConversionContext context) { - - // Create interaction for request - Interaction interaction=new Interaction(); - //interaction.derivedFrom(this); - - TVariable var=context.getVariable(invoke.getOutputVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - ms.setOperation(invoke.getOperation()); - ms.getTypeReferences().add(tref); - - String fromRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); - - if (fromRole != null) { - interaction.setFromRole(new Role(fromRole)); - } - - if (context.getRole() != null) { - interaction.getToRoles().add(new Role(context.getRole())); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - } - - protected static void convertFaultResponse(TInvoke invoke, java.util.List<Activity> activities, - String faultVar, QName faultMesgType, ConversionContext context) { - - // Create interaction for request - Interaction interaction=new Interaction(); - //interaction.derivedFrom(this); - - TypeReference tref=null; - - // TODO: Not sure if fault variable is supposed to be declared - // in catch scope, or reused from outer scope?? If declared, - // then without the message type/element, may be difficult to - // define the message signature. - - TVariable var=context.getVariable(faultVar); - - if (var != null) { - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - tref = TypeReferenceUtil.createTypeReference(xmlType, context); - //tref.setLocalpart(var.getMessageType()); - } else if (faultMesgType != null) { - tref = TypeReferenceUtil.createTypeReference(faultMesgType.getLocalPart(), context); - //tref.setLocalpart(faultMesgType); - } - - MessageSignature ms=new MessageSignature(); - ms.setOperation(invoke.getOperation()); - ms.getTypeReferences().add(tref); - - String fromRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); - - if (fromRole != null) { - interaction.setFromRole(new Role(fromRole)); - } - - if (context.getRole() != null) { - interaction.getToRoles().add(new Role(context.getRole())); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,231 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import javax.xml.namespace.QName; + +import org.savara.bpel.model.TCatch; +import org.savara.bpel.model.TInvoke; +import org.savara.bpel.model.TScope; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents an unsupported (or custom) action within + * the conversation based ESB service descriptor. + * + */ +public class InvokeParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TInvoke); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TInvoke invoke=(TInvoke)component; + + //getSource().setComponentURI(getURI()); + + convertRequest(invoke, activities, context); + + // Check if invoke is contained within a scope that defines + // fault handlers. If so, then generate choice to throw + // fault exceptions. + TScope scope=context.getScope(); + + if (scope != null && scope.getFaultHandlers() != null && + (scope.getFaultHandlers().getCatch().size() > 0 || + scope.getFaultHandlers().getCatchAll() != null)) { + org.scribble.protocol.model.Choice te= + new org.scribble.protocol.model.Choice(); + //te.derivedFrom(this); + + activities.add(te); + + org.scribble.protocol.model.When when= + new org.scribble.protocol.model.When(); + te.getWhens().add(when); + + activities = when.getBlock().getContents(); + + for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { + TCatch catchBlock=scope.getFaultHandlers().getCatch().get(i); + + org.scribble.protocol.model.When fcb= + new org.scribble.protocol.model.When(); + + QName mesgType=catchBlock.getFaultMessageType(); + + if (mesgType == null) { + mesgType = catchBlock.getFaultElement(); + } + + TVariable faultVar=null; + + if (catchBlock.getFaultVariable() != null) { + faultVar = new TVariable(); + faultVar.setName(catchBlock.getFaultVariable()); + faultVar.setMessageType(catchBlock.getFaultMessageType()); + faultVar.setElement(catchBlock.getFaultElement()); + context.addVariable(faultVar); + } + + convertFaultResponse(invoke, fcb.getBlock().getContents(), catchBlock.getFaultVariable(), + mesgType, context); + + org.scribble.protocol.model.Raise raise= + new org.scribble.protocol.model.Raise(); + + TypeReference tref=new TypeReference(); + tref.setName(catchBlock.getFaultName().getLocalPart()); + raise.setType(tref); + + fcb.getBlock().add(raise); + + te.getWhens().add(fcb); + + if (faultVar != null) { + context.removeVariable(faultVar); + } + } + } + + if (invoke.getOutputVariable() != null) { + + convertResponse(invoke, activities, context); + } + } + + protected static void convertRequest(TInvoke invoke, java.util.List<Activity> activities, + ConversionContext context) { + // Create interaction for request + Interaction interaction=new Interaction(); + //interaction.derivedFrom(this); + + TVariable var=context.getVariable(invoke.getInputVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + ms.setOperation(invoke.getOperation()); + ms.getTypeReferences().add(tref); + + //if (context.getRole() != null) { + // interaction.setFromRole(new Role(context.getRole())); + //} + + String toRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); + + if (toRole != null) { + interaction.getToRoles().add(new Role(toRole)); + } + + interaction.setMessageSignature(ms); + + activities.add(interaction); + } + + protected static void convertResponse(TInvoke invoke, java.util.List<Activity> activities, + ConversionContext context) { + + // Create interaction for request + Interaction interaction=new Interaction(); + //interaction.derivedFrom(this); + + TVariable var=context.getVariable(invoke.getOutputVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + ms.setOperation(invoke.getOperation()); + ms.getTypeReferences().add(tref); + + String fromRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); + + if (fromRole != null) { + interaction.setFromRole(new Role(fromRole)); + } + + //if (context.getRole() != null) { + // interaction.getToRoles().add(new Role(context.getRole())); + //} + + interaction.setMessageSignature(ms); + + activities.add(interaction); + } + + protected static void convertFaultResponse(TInvoke invoke, java.util.List<Activity> activities, + String faultVar, QName faultMesgType, ConversionContext context) { + + // Create interaction for request + Interaction interaction=new Interaction(); + //interaction.derivedFrom(this); + + TypeReference tref=null; + + // TODO: Not sure if fault variable is supposed to be declared + // in catch scope, or reused from outer scope?? If declared, + // then without the message type/element, may be difficult to + // define the message signature. + + TVariable var=context.getVariable(faultVar); + + if (var != null) { + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + tref = TypeReferenceUtil.createTypeReference(xmlType, context); + //tref.setLocalpart(var.getMessageType()); + } else if (faultMesgType != null) { + tref = TypeReferenceUtil.createTypeReference(faultMesgType.getLocalPart(), context); + //tref.setLocalpart(faultMesgType); + } + + MessageSignature ms=new MessageSignature(); + ms.setOperation(invoke.getOperation()); + ms.getTypeReferences().add(tref); + + String fromRole=PartnerLinkUtil.getClientPartnerRole(invoke.getPartnerLink()); + + if (fromRole != null) { + interaction.setFromRole(new Role(fromRole)); + } + + //if (context.getRole() != null) { + // interaction.getToRoles().add(new Role(context.getRole())); + //} + + interaction.setMessageSignature(ms); + + activities.add(interaction); + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/OnMessageGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/OnMessageGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/OnMessageGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TOnMessage; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.ActivityUtil; -import org.savara.bpel.util.InteractionUtil; -import org.savara.bpel.util.PartnerLinkUtil; -import org.savara.bpel.util.TypeReferenceUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents the 'onMessage' construct contained - * within the 'pick' activity. - */ -public class OnMessageGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TOnMessage); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TOnMessage elem=(TOnMessage)component; - - Interaction interaction=new Interaction(); - - TVariable var=context.getVariable(elem.getVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - ms.setOperation(elem.getOperation()); - ms.getTypeReferences().add(tref); - - String fromRole=PartnerLinkUtil.getServerPartnerRole(elem.getPartnerLink()); - - if (fromRole != null) { - interaction.setFromRole(new Role(fromRole)); - } - - if (context.getRole() != null) { - interaction.getToRoles().add(new Role(context.getRole())); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - - TActivity act=ActivityUtil.getActivity(elem); - - if (act != null) { - context.convert(act, activities); - } - } -} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TOnMessage; -import org.savara.bpel.model.TPick; -import org.savara.bpel.model.TReply; -import org.scribble.protocol.model.*; - -/** - * This class represents a pick grouping activity. - * - * @author gary - */ -public class PickGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TReply); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TPick pick=(TPick)component; - - //getSource().setComponentURI(getURI()); - - org.scribble.protocol.model.Choice elem= - new org.scribble.protocol.model.Choice(); - - // Convert 'onMessage' paths - for (int i=0; i < pick.getOnMessage().size(); i++) { - TOnMessage onMessageElem=pick.getOnMessage().get(i); - - When cb = new When(); - - context.convert(onMessageElem, cb.getBlock().getContents()); - - elem.getWhens().add(cb); - } - - // TODO: If alarms defined, then model these using a - // try/catch with interrupt? - - activities.add(elem); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,110 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TOnMessage; +import org.savara.bpel.model.TPick; +import org.savara.bpel.model.TReply; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.ActivityUtil; +import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a pick grouping activity. + * + * @author gary + */ +public class PickParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TPick); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TPick pick=(TPick)component; + + //getSource().setComponentURI(getURI()); + + org.scribble.protocol.model.Choice elem= + new org.scribble.protocol.model.Choice(); + + Role fromRole=null; + + // Convert 'onMessage' paths + for (int i=0; i < pick.getOnMessage().size(); i++) { + TOnMessage onMessageElem=pick.getOnMessage().get(i); + + When cb = new When(); + + context.convert(onMessageElem, cb.getBlock().getContents(), journal); + + String fromRoleName=PartnerLinkUtil.getServerPartnerRole(onMessageElem.getPartnerLink()); + + if (i == 0) { + // Obtain from/to roles + if (fromRoleName != null) { + fromRole = new Role(fromRoleName); + } + } else { + // TODO: Check 'from role' for other paths + if (fromRoleName != null && + fromRole != null && + fromRoleName.equals(fromRole.getName()) == false) { + journal.error("Pick path has different from roles", null); + } + } + + elem.setFromRole(fromRole); + + TVariable var=context.getVariable(onMessageElem.getVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + ms.setOperation(onMessageElem.getOperation()); + ms.getTypeReferences().add(tref); + + cb.setMessageSignature(ms); + + // Process the contained activities + TActivity act=ActivityUtil.getActivity(onMessageElem); + + if (act != null) { + context.convert(act, cb.getBlock().getContents(), journal); + } + + elem.getWhens().add(cb); + } + + // TODO: If alarms defined, then model these using a + // try/catch with interrupt? + + activities.add(elem); + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,190 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import javax.xml.namespace.QName; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TCatch; -import org.savara.bpel.model.TInvoke; -import org.savara.bpel.model.TProcess; -import org.savara.bpel.model.TSequence; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.ActivityUtil; -import org.savara.bpel.util.InteractionUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents a BPEL process. - * - * @author gary - */ -public class ProcessGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TProcess); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TProcess process=(TProcess)component; - - // Add variables to the context - for (int i=0; i < process.getVariables().getVariable().size(); i++) { - context.addVariable(process.getVariables().getVariable().get(i)); - } - - // Count number of invoke activities - int invokeCount=InteractionUtil.countInvokes(process); - - // Check whether scope has been defined to represent - // an interaction with one or more fault responses and - // no event handlers - TInvoke invoke=null; - TActivity act=ActivityUtil.getActivity(process); - - if (invokeCount == 1 && - process.getFaultHandlers() != null && (process.getFaultHandlers().getCatch().size() > 0 || - process.getFaultHandlers().getCatchAll() != null) && - (process.getEventHandlers() == null || (process.getEventHandlers().getOnEvent().size() == 0 && - process.getEventHandlers().getOnAlarm().size() == 0)) && - (invoke = InteractionUtil.getInvoke(act)) != null) { - - InvokeGenerationRule.convertRequest(invoke, activities, context); - - // Create choice with normal response and fault paths - org.scribble.protocol.model.Choice choice=new org.scribble.protocol.model.Choice(); - - When cb=new When(); - - InvokeGenerationRule.convertResponse(invoke, cb.getBlock().getContents(), context); - - // Include remaining activities - if (act instanceof TSequence) { - for (int i=1; i < ((TSequence)act).getActivity().size(); i++) { - context.convert(((TSequence)act).getActivity().get(i), cb.getBlock().getContents()); - } - } - - choice.getWhens().add(cb); - - // Process fault handlers - for (int i=0; i < process.getFaultHandlers().getCatch().size(); i++) { - TCatch catchBlock=process.getFaultHandlers().getCatch().get(i); - - When fcb=new When(); - - QName mesgType=catchBlock.getFaultMessageType(); - - if (mesgType == null) { - mesgType = catchBlock.getFaultElement(); - } - - TVariable faultVar=null; - - if (catchBlock.getFaultVariable() != null) { - faultVar = new TVariable(); - faultVar.setName(catchBlock.getFaultVariable()); - faultVar.setMessageType(catchBlock.getFaultMessageType()); - faultVar.setElement(catchBlock.getFaultElement()); - context.addVariable(faultVar); - } - - InvokeGenerationRule.convertFaultResponse(invoke, - fcb.getBlock().getContents(), catchBlock.getFaultVariable(), - mesgType, context); - - TActivity cbact=ActivityUtil.getActivity(catchBlock); - - if (cbact != null) { - context.convert(cbact, fcb.getBlock().getContents()); - } - - choice.getWhens().add(fcb); - - if (faultVar != null) { - context.removeVariable(faultVar); - } - } - - activities.add(choice); - } else { - // Store in local var, in case try/catch block needs to be - // added - java.util.List<Activity> acts=activities; - - // Check if try/catch block is required - if (process.getFaultHandlers() != null && - (process.getFaultHandlers().getCatch().size() > 0 || - process.getFaultHandlers().getCatchAll() != null)) { - org.scribble.protocol.model.Try te= - new org.scribble.protocol.model.Try(); - //te.derivedFrom(this); - //te.getBlock().derivedFrom(this); - - acts.add(te); - - acts = te.getBlock().getContents(); - - for (int i=0; i < process.getFaultHandlers().getCatch().size(); i++) { - TCatch catchPath=process.getFaultHandlers().getCatch().get(i); - - org.scribble.protocol.model.Catch cb= - new org.scribble.protocol.model.Catch(); - //cb.derivedFrom(catchPath); - - /* TODO: How to deal with catch based on type? - * - * - TypeReference tref=new TypeReference(); - tref.setName(XMLUtils.getLocalname(catchPath.getFaultName())); - cb.setType(tref); - */ - - TVariable faultVar=null; - - if (catchPath.getFaultVariable() != null) { - faultVar = new TVariable(); - faultVar.setName(catchPath.getFaultVariable()); - faultVar.setMessageType(catchPath.getFaultMessageType()); - faultVar.setElement(catchPath.getFaultElement()); - context.addVariable(faultVar); - } - - TActivity cbact=ActivityUtil.getActivity(catchPath); - - if (cbact != null) { - context.convert(cbact, cb.getBlock().getContents()); - } - - if (faultVar != null) { - context.removeVariable(faultVar); - } - - te.getCatches().add(cb); - } - } - - // Convert normal activities in scope - if (act != null) { - context.convert(act, acts); - } - } - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,193 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import javax.xml.namespace.QName; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TCatch; +import org.savara.bpel.model.TInvoke; +import org.savara.bpel.model.TProcess; +import org.savara.bpel.model.TSequence; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.ActivityUtil; +import org.savara.bpel.util.InteractionUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a BPEL process. + * + * @author gary + */ +public class ProcessParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TProcess); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TProcess process=(TProcess)component; + + // Add variables to the context + for (int i=0; i < process.getVariables().getVariable().size(); i++) { + context.addVariable(process.getVariables().getVariable().get(i)); + } + + // Count number of invoke activities + int invokeCount=InteractionUtil.countInvokes(process); + + // Check whether scope has been defined to represent + // an interaction with one or more fault responses and + // no event handlers + TInvoke invoke=null; + TActivity act=ActivityUtil.getActivity(process); + + if (//invokeCount == 1 && + process.getFaultHandlers() != null && (process.getFaultHandlers().getCatch().size() > 0 || + process.getFaultHandlers().getCatchAll() != null) && + (process.getEventHandlers() == null || (process.getEventHandlers().getOnEvent().size() == 0 && + process.getEventHandlers().getOnAlarm().size() == 0)) && + (invoke = InteractionUtil.getInvoke(act)) != null) { + + InvokeParserRule.convertRequest(invoke, activities, context); + + // Create choice with normal response and fault paths + org.scribble.protocol.model.Choice choice=new org.scribble.protocol.model.Choice(); + + When cb=new When(); + + InvokeParserRule.convertResponse(invoke, cb.getBlock().getContents(), context); + + // Include remaining activities + if (act instanceof TSequence) { + for (int i=1; i < ((TSequence)act).getActivity().size(); i++) { + context.convert(((TSequence)act).getActivity().get(i), cb.getBlock().getContents(), + journal); + } + } + + choice.getWhens().add(cb); + + // Process fault handlers + for (int i=0; i < process.getFaultHandlers().getCatch().size(); i++) { + TCatch catchBlock=process.getFaultHandlers().getCatch().get(i); + + When fcb=new When(); + + QName mesgType=catchBlock.getFaultMessageType(); + + if (mesgType == null) { + mesgType = catchBlock.getFaultElement(); + } + + TVariable faultVar=null; + + if (catchBlock.getFaultVariable() != null) { + faultVar = new TVariable(); + faultVar.setName(catchBlock.getFaultVariable()); + faultVar.setMessageType(catchBlock.getFaultMessageType()); + faultVar.setElement(catchBlock.getFaultElement()); + context.addVariable(faultVar); + } + + InvokeParserRule.convertFaultResponse(invoke, + fcb.getBlock().getContents(), catchBlock.getFaultVariable(), + mesgType, context); + + TActivity cbact=ActivityUtil.getActivity(catchBlock); + + if (cbact != null) { + context.convert(cbact, fcb.getBlock().getContents(), journal); + } + + choice.getWhens().add(fcb); + + if (faultVar != null) { + context.removeVariable(faultVar); + } + } + + activities.add(choice); + } else { + // Store in local var, in case try/catch block needs to be + // added + java.util.List<Activity> acts=activities; + + // Check if try/catch block is required + if (process.getFaultHandlers() != null && + (process.getFaultHandlers().getCatch().size() > 0 || + process.getFaultHandlers().getCatchAll() != null)) { + org.scribble.protocol.model.Try te= + new org.scribble.protocol.model.Try(); + //te.derivedFrom(this); + //te.getBlock().derivedFrom(this); + + acts.add(te); + + acts = te.getBlock().getContents(); + + for (int i=0; i < process.getFaultHandlers().getCatch().size(); i++) { + TCatch catchPath=process.getFaultHandlers().getCatch().get(i); + + org.scribble.protocol.model.Catch cb= + new org.scribble.protocol.model.Catch(); + //cb.derivedFrom(catchPath); + + /* TODO: How to deal with catch based on type? + * + * + TypeReference tref=new TypeReference(); + tref.setName(XMLUtils.getLocalname(catchPath.getFaultName())); + cb.setType(tref); + */ + + TVariable faultVar=null; + + if (catchPath.getFaultVariable() != null) { + faultVar = new TVariable(); + faultVar.setName(catchPath.getFaultVariable()); + faultVar.setMessageType(catchPath.getFaultMessageType()); + faultVar.setElement(catchPath.getFaultElement()); + context.addVariable(faultVar); + } + + TActivity cbact=ActivityUtil.getActivity(catchPath); + + if (cbact != null) { + context.convert(cbact, cb.getBlock().getContents(), journal); + } + + if (faultVar != null) { + context.removeVariable(faultVar); + } + + te.getCatches().add(cb); + } + } + + // Convert normal activities in scope + if (act != null) { + context.convert(act, acts, journal); + } + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import org.scribble.protocol.model.Activity; - -/** - * This interface represents a generation rule from a domain specific component - * to a Protocol component. - * - */ -public interface ProtocolGenerationRule { - - /** - * This method determines whether the supplied domain component is supported - * by this conversion rule. - * - * @param context The conversion context - * @param component The domain component - * @return Whether the component is supported for this rule - */ - public boolean isSupported(Object component); - - /** - * This method converts a domain specific component to a protocol component and - * add it to the supplied activity list. - * - * @param context The conversion context - * @param component The domain component - * @param activities The list of protocol activities - */ - public void convert(ConversionContext context, Object component, java.util.List<Activity> activities); - -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProtocolParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.Activity; + +/** + * This interface represents a generation rule from a domain specific component + * to a Protocol component. + * + */ +public interface ProtocolParserRule { + + /** + * This method determines whether the supplied domain component is supported + * by this conversion rule. + * + * @param context The conversion context + * @param component The domain component + * @return Whether the component is supported for this rule + */ + public boolean isSupported(Object component); + + /** + * This method converts a domain specific component to a protocol component and + * add it to the supplied activity list. + * + * @param context The conversion context + * @param component The domain component + * @param activities The list of protocol activities + */ + public void convert(ConversionContext context, Object component, java.util.List<Activity> activities, + Journal journal); + +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TReceive; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.InteractionUtil; -import org.savara.bpel.util.PartnerLinkUtil; -import org.savara.bpel.util.TypeReferenceUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents an unsupported (or custom) action within - * the conversation based ESB service descriptor. - * - * @author gary - */ -public class ReceiveGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TReceive); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TReceive elem=(TReceive)component; - - //getSource().setComponentURI(getURI()); - - Interaction interaction=new Interaction(); - //interaction.derivedFrom(this); - - TVariable var=context.getVariable(elem.getVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - //ms.derivedFrom(this); - - ms.setOperation(elem.getOperation()); - ms.getTypeReferences().add(tref); - - String fromRole=PartnerLinkUtil.getServerPartnerRole(elem.getPartnerLink()); - - if (fromRole != null && fromRole.equals(context.getRole())) { - fromRole = PartnerLinkUtil.getClientPartnerRole(elem.getPartnerLink()); - } - - if (fromRole != null) { - interaction.setFromRole(new Role(fromRole)); - } - - if (context.getRole() != null) { - interaction.getToRoles().add(new Role(context.getRole())); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - } - -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TReceive; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents an unsupported (or custom) action within + * the conversation based ESB service descriptor. + * + * @author gary + */ +public class ReceiveParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TReceive); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TReceive elem=(TReceive)component; + + //getSource().setComponentURI(getURI()); + + Interaction interaction=new Interaction(); + //interaction.derivedFrom(this); + + TVariable var=context.getVariable(elem.getVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + //ms.derivedFrom(this); + + ms.setOperation(elem.getOperation()); + ms.getTypeReferences().add(tref); + + String fromRole=PartnerLinkUtil.getServerPartnerRole(elem.getPartnerLink()); + + if (fromRole != null && fromRole.equals(context.getRole())) { + fromRole = PartnerLinkUtil.getClientPartnerRole(elem.getPartnerLink()); + } + + if (fromRole != null) { + interaction.setFromRole(new Role(fromRole)); + } + + //if (context.getRole() != null) { + // interaction.getToRoles().add(new Role(context.getRole())); + //} + + interaction.setMessageSignature(ms); + + activities.add(interaction); + } + +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TReply; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.InteractionUtil; -import org.savara.bpel.util.PartnerLinkUtil; -import org.savara.bpel.util.TypeReferenceUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents a BPEL reply activity. - * - * @author gary - */ -public class ReplyGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TReply); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TReply reply=(TReply)component; - - //getSource().setComponentURI(getURI()); - - Interaction interaction=new Interaction(); - //interaction.derivedFrom(this); - - TVariable var=context.getVariable(reply.getVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - //ms.derivedFrom(this); - - ms.setOperation(reply.getOperation()); - ms.getTypeReferences().add(tref); - - if (context.getRole() != null) { - interaction.setFromRole(new Role(context.getRole())); - } - - String toRole=PartnerLinkUtil.getServerPartnerRole(reply.getPartnerLink()); - - if (toRole != null) { - interaction.getToRoles().add(new Role(toRole)); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - } - -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TReply; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a BPEL reply activity. + * + * @author gary + */ +public class ReplyParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TReply); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TReply reply=(TReply)component; + + //getSource().setComponentURI(getURI()); + + Interaction interaction=new Interaction(); + //interaction.derivedFrom(this); + + TVariable var=context.getVariable(reply.getVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + //ms.derivedFrom(this); + + ms.setOperation(reply.getOperation()); + ms.getTypeReferences().add(tref); + + //if (context.getRole() != null) { + // interaction.setFromRole(new Role(context.getRole())); + //} + + String toRole=PartnerLinkUtil.getServerPartnerRole(reply.getPartnerLink()); + + if (toRole != null) { + interaction.getToRoles().add(new Role(toRole)); + } + + interaction.setMessageSignature(ms); + + activities.add(interaction); + } + +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,193 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import javax.xml.namespace.QName; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TCatch; -import org.savara.bpel.model.TInvoke; -import org.savara.bpel.model.TScope; -import org.savara.bpel.model.TSequence; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.ActivityUtil; -import org.savara.bpel.util.InteractionUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents a scope grouping activity. - * - * @author gary - */ -public class ScopeGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TScope); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TScope scope=(TScope)component; - - //getSource().setComponentURI(getURI()); - - // Add variables to the context - for (int i=0; i < scope.getVariables().getVariable().size(); i++) { - context.addVariable(scope.getVariables().getVariable().get(i)); - } - - // Count number of invoke activities - int invokeCount=InteractionUtil.countInvokes(scope); - - // Check whether scope has been defined to represent - // an interaction with one or more fault responses and - // no event handlers - TInvoke invoke=null; - - if (invokeCount == 1 && - scope.getFaultHandlers() != null && (scope.getFaultHandlers().getCatch().size() > 0 || - scope.getFaultHandlers().getCatchAll() != null) && - (scope.getEventHandlers() == null || (scope.getEventHandlers().getOnEvent().size() == 0 && - scope.getEventHandlers().getOnAlarm().size() == 0)) && - (invoke = InteractionUtil.getInvoke(ActivityUtil.getActivity(scope))) != null) { - - InvokeGenerationRule.convertRequest(invoke, activities, context); - - // Create choice with normal response and fault paths - org.scribble.protocol.model.Choice choice=new org.scribble.protocol.model.Choice(); - - When cb=new When(); - - InvokeGenerationRule.convertResponse(invoke, cb.getBlock().getContents(), context); - - // Include remaining activities - if (scope.getSequence() != null) { - for (int i=1; i < ((TSequence)scope.getSequence()).getActivity().size(); i++) { - context.convert(((TSequence)scope.getSequence()).getActivity().get(i), - cb.getBlock().getContents()); - } - } - - choice.getWhens().add(cb); - - // Process fault handlers - for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { - TCatch catchBlock=scope.getFaultHandlers().getCatch().get(i); - - When fcb=new When(); - - QName mesgType=catchBlock.getFaultMessageType(); - - if (mesgType == null) { - mesgType = catchBlock.getFaultElement(); - } - - TVariable faultVar=null; - - if (catchBlock.getFaultVariable() != null) { - faultVar = new TVariable(); - faultVar.setName(catchBlock.getFaultVariable()); - faultVar.setMessageType(catchBlock.getFaultMessageType()); - faultVar.setElement(catchBlock.getFaultElement()); - context.addVariable(faultVar); - } - - InvokeGenerationRule.convertFaultResponse(invoke, fcb.getBlock().getContents(), - catchBlock.getFaultVariable(), mesgType, context); - - TActivity act=ActivityUtil.getActivity(catchBlock); - - if (act != null) { - context.convert(act, fcb.getBlock().getContents()); - } - - choice.getWhens().add(fcb); - - if (faultVar != null) { - context.removeVariable(faultVar); - } - } - - activities.add(choice); - } else { - // Store in local var, in case try/catch block needs to be - // added - java.util.List<Activity> acts=activities; - - // Check if try/catch block is required - if (scope.getFaultHandlers() != null && - (scope.getFaultHandlers().getCatch().size() > 0 || - scope.getFaultHandlers().getCatchAll() != null)) { - org.scribble.protocol.model.Try te= - new org.scribble.protocol.model.Try(); - //te.derivedFrom(this); - //te.getBlock().derivedFrom(this); - - acts.add(te); - - acts = te.getBlock().getContents(); - - for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { - TCatch catchPath=scope.getFaultHandlers().getCatch().get(i); - - org.scribble.protocol.model.Catch cb= - new org.scribble.protocol.model.Catch(); - //cb.derivedFrom(catchPath); - - TypeReference tref=new TypeReference(); - tref.setName(catchPath.getFaultName().getLocalPart()); - - //cb.setType(tref); - - // TODO: Need to do a search for first interaction in the block, - // and treat that as the triggering condition - - TVariable faultVar=null; - - if (catchPath.getFaultVariable() != null) { - faultVar = new TVariable(); - faultVar.setName(catchPath.getFaultVariable()); - faultVar.setMessageType(catchPath.getFaultMessageType()); - faultVar.setElement(catchPath.getFaultElement()); - context.addVariable(faultVar); - } - - TActivity act=ActivityUtil.getActivity(catchPath); - - if (act != null) { - context.convert(act, cb.getBlock().getContents()); - } - - if (faultVar != null) { - context.removeVariable(faultVar); - } - - te.getCatches().add(cb); - } - } - - // Convert normal activities in scope - TActivity act=ActivityUtil.getActivity(scope); - - if (act != null) { - context.convert(act, acts); - } - } - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,220 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import javax.xml.namespace.QName; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TCatch; +import org.savara.bpel.model.TInvoke; +import org.savara.bpel.model.TScope; +import org.savara.bpel.model.TSequence; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.ActivityUtil; +import org.savara.bpel.util.InteractionUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a scope grouping activity. + * + * @author gary + */ +public class ScopeParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TScope); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TScope scope=(TScope)component; + + //getSource().setComponentURI(getURI()); + + // Add variables to the context + if (scope.getVariables() != null) { + for (int i=0; i < scope.getVariables().getVariable().size(); i++) { + context.addVariable(scope.getVariables().getVariable().get(i)); + } + } + + // Count number of invoke activities + int invokeCount=InteractionUtil.countInvokes(scope); + + // Check whether scope has been defined to represent + // an interaction with one or more fault responses and + // no event handlers + TInvoke invoke=null; + + if (//invokeCount == 1 && + scope.getFaultHandlers() != null && (scope.getFaultHandlers().getCatch().size() > 0 || + scope.getFaultHandlers().getCatchAll() != null) && + (scope.getEventHandlers() == null || (scope.getEventHandlers().getOnEvent().size() == 0 && + scope.getEventHandlers().getOnAlarm().size() == 0)) && + (invoke = InteractionUtil.getInvoke(ActivityUtil.getActivity(scope))) != null) { + + InvokeParserRule.convertRequest(invoke, activities, context); + + // Create choice with normal response and fault paths + org.scribble.protocol.model.Choice choice=new org.scribble.protocol.model.Choice(); + + When cb=new When(); + + InvokeParserRule.convertResponse(invoke, cb.getBlock().getContents(), context); + + if (cb.getBlock().getContents().size() > 0) { + Interaction resp=(Interaction)cb.getBlock().getContents().get(0); + cb.getBlock().getContents().remove(resp); + + cb.setMessageSignature(resp.getMessageSignature()); + + choice.setFromRole(resp.getFromRole()); + } + + // Include remaining activities + if (scope.getSequence() != null) { + for (int i=1; i < ((TSequence)scope.getSequence()).getActivity().size(); i++) { + context.convert(((TSequence)scope.getSequence()).getActivity().get(i), + cb.getBlock().getContents(), journal); + } + } + + choice.getWhens().add(cb); + + // Process fault handlers + for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { + TCatch catchBlock=scope.getFaultHandlers().getCatch().get(i); + + When fcb=new When(); + + QName mesgType=catchBlock.getFaultMessageType(); + + if (mesgType == null) { + mesgType = catchBlock.getFaultElement(); + } + + TVariable faultVar=null; + + if (catchBlock.getFaultVariable() != null) { + faultVar = new TVariable(); + faultVar.setName(catchBlock.getFaultVariable()); + faultVar.setMessageType(catchBlock.getFaultMessageType()); + faultVar.setElement(catchBlock.getFaultElement()); + context.addVariable(faultVar); + } + + InvokeParserRule.convertFaultResponse(invoke, fcb.getBlock().getContents(), + catchBlock.getFaultVariable(), mesgType, context); + + if (fcb.getBlock().getContents().size() > 0) { + Interaction resp=(Interaction)fcb.getBlock().getContents().get(0); + fcb.getBlock().getContents().remove(resp); + + fcb.setMessageSignature(resp.getMessageSignature()); + + // Validate from role + if (resp.getFromRole() != null && + choice.getFromRole() != null && + resp.getFromRole().equals(choice.getFromRole()) == false) { + journal.error("Fault handler 'from role' not same as normal response", null); + } + } + + TActivity act=ActivityUtil.getActivity(catchBlock); + + if (act != null) { + context.convert(act, fcb.getBlock().getContents(), journal); + } + + choice.getWhens().add(fcb); + + if (faultVar != null) { + context.removeVariable(faultVar); + } + } + + activities.add(choice); + } else { + // Store in local var, in case try/catch block needs to be + // added + java.util.List<Activity> acts=activities; + + // Check if try/catch block is required + if (scope.getFaultHandlers() != null && + (scope.getFaultHandlers().getCatch().size() > 0 || + scope.getFaultHandlers().getCatchAll() != null)) { + org.scribble.protocol.model.Try te= + new org.scribble.protocol.model.Try(); + //te.derivedFrom(this); + //te.getBlock().derivedFrom(this); + + acts.add(te); + + acts = te.getBlock().getContents(); + + for (int i=0; i < scope.getFaultHandlers().getCatch().size(); i++) { + TCatch catchPath=scope.getFaultHandlers().getCatch().get(i); + + org.scribble.protocol.model.Catch cb= + new org.scribble.protocol.model.Catch(); + //cb.derivedFrom(catchPath); + + TypeReference tref=new TypeReference(); + tref.setName(catchPath.getFaultName().getLocalPart()); + + //cb.setType(tref); + + // TODO: Need to do a search for first interaction in the block, + // and treat that as the triggering condition + + TVariable faultVar=null; + + if (catchPath.getFaultVariable() != null) { + faultVar = new TVariable(); + faultVar.setName(catchPath.getFaultVariable()); + faultVar.setMessageType(catchPath.getFaultMessageType()); + faultVar.setElement(catchPath.getFaultElement()); + context.addVariable(faultVar); + } + + TActivity act=ActivityUtil.getActivity(catchPath); + + if (act != null) { + context.convert(act, cb.getBlock().getContents(), journal); + } + + if (faultVar != null) { + context.removeVariable(faultVar); + } + + te.getCatches().add(cb); + } + } + + // Convert normal activities in scope + TActivity act=ActivityUtil.getActivity(scope); + + if (act != null) { + context.convert(act, acts, journal); + } + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TSequence; -import org.scribble.protocol.model.*; - -/** - * This class represents a sequence grouping activity. - * - * @author gary - */ -public class SequenceGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TSequence); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TSequence bpelElem=(TSequence)component; - - //getSource().setComponentURI(getURI()); - - for (int i=0; i < bpelElem.getActivity().size(); i++) { - context.convert(bpelElem.getActivity().get(i), activities); - } - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/SequenceParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TSequence; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a sequence grouping activity. + * + * @author gary + */ +public class SequenceParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TSequence); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TSequence bpelElem=(TSequence)component; + + //getSource().setComponentURI(getURI()); + + for (int i=0; i < bpelElem.getActivity().size(); i++) { + context.convert(bpelElem.getActivity().get(i), activities, journal); + } + } +} Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java 2010-12-22 22:50:23 UTC (rev 513) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileGenerationRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TWhile; -import org.savara.bpel.util.ActivityUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents a while grouping activity. - * - * @author gary - */ -public class WhileGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TWhile); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TWhile bpelElem=(TWhile)component; - - //getSource().setComponentURI(getURI()); - - org.scribble.protocol.model.Repeat elem= - new org.scribble.protocol.model.Repeat(); - - // TODO: Convert while expression - - TActivity act=ActivityUtil.getActivity(bpelElem); - - if (act != null) { - context.convert(act, elem.getBlock().getContents()); - } - - activities.add(elem); - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileParserRule.java (from rev 513, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileParserRule.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/WhileParserRule.java 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser.rules; + +import java.util.List; + +import org.savara.bpel.model.TActivity; +import org.savara.bpel.model.TWhile; +import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.*; + +/** + * This class represents a while grouping activity. + * + * @author gary + */ +public class WhileParserRule implements ProtocolParserRule { + + public boolean isSupported(Object component) { + return(component instanceof TWhile); + } + + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { + TWhile bpelElem=(TWhile)component; + + //getSource().setComponentURI(getURI()); + + org.scribble.protocol.model.Repeat elem= + new org.scribble.protocol.model.Repeat(); + + // TODO: Convert while expression + + TActivity act=ActivityUtil.getActivity(bpelElem); + + if (act != null) { + context.convert(act, elem.getBlock().getContents(), journal); + } + + activities.add(elem); + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/TypeReferenceUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/TypeReferenceUtil.java 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/TypeReferenceUtil.java 2011-01-05 16:17:24 UTC (rev 533) @@ -19,7 +19,7 @@ import javax.xml.namespace.QName; -import org.savara.bpel.generator.protocol.ConversionContext; +import org.savara.bpel.parser.rules.ConversionContext; import org.scribble.protocol.model.TypeReference; public class TypeReferenceUtil { 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-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05 16:17:24 UTC (rev 533) @@ -36,8 +36,9 @@ suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); + /* - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods@Buyer")); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr 2011-01-05 16:17:24 UTC (rev 533) @@ -1,4 +1,4 @@ -protocol ESBBrokerProcess_Broker { +protocol ESBBrokerProcess_Broker @ BrokerBehavior { makeEnquiry(enquiry) from Buyer; repeat { getQuote(requestForQuote) to SupplierQuoteEngine; Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr 2011-01-05 16:17:24 UTC (rev 533) @@ -1,4 +1,4 @@ -protocol ESBBrokerProcess_Buyer { +protocol ESBBrokerProcess_Buyer @ Buyer { makeEnquiry(enquiry) to Broker; makeEnquiry(quoteList) from Broker; choice to Broker { Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv 2011-01-05 16:17:24 UTC (rev 533) @@ -1,12 +0,0 @@ -namespace null; - -conversation ESBBrokerProcess_CreditAgency@CreditAgency implements Common@CreditAgency { - if { - checkCredit(CreditCheckRequest) from Broker to CreditAgency; - if { - checkCredit(CreditCheckOk) from CreditAgency to Broker; - } else if { - checkCredit(CreditCheckInvalid) from CreditAgency to Broker; - } - } -} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.spr 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,9 @@ +protocol ESBBrokerProcess_CreditAgency @ CreditAgency { + checkCredit(CreditCheckRequest) from Broker; + choice to Broker { + checkCredit(CreditCheckOk): + + checkCredit(CreditCheckInvalid): + + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel 2011-01-05 16:17:24 UTC (rev 533) @@ -5,7 +5,7 @@ <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <import namespace="http://www.pi4soa.org/ESBBroker/Buyer" location="ESBBrokerProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> <partnerLinks> - <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> + <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester" myRole="Buyer"/> </partnerLinks> <variables> <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelex =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelex (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelex 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="ASCII"?> +<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="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.0"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.1"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.2"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.3"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.4"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/(a)activities.0"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/(a)activities.1"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/(a)activity"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/@activity/(a)activities.0"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/(a)activity"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/(a)activities.0"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@faultHandlers/@catch.0/(a)faultVariable"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@faultHandlers/@catch.0/(a)activity"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/(a)activity"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@activity/(a)activities.0"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> + </extensions> + <extensions> + <extendedObject href="ESBBrokerProcess_Buyer.bpel#/"/> + <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1294243978000"/> + </extensions> +</extensionmodel:ExtensionMap> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel 2011-01-04 22:28:15 UTC (rev 532) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel 2011-01-05 16:17:24 UTC (rev 533) @@ -1,36 +1,29 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> - </variables> - <sequence> - <pick> - <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar"> - <sequence> - <scope> - <sequence> - <if> - <sequence> - <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/> - </sequence> - <else> - <sequence> - <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/> - </sequence> - </else> - </if> - </sequence> - </scope> - </sequence> - </onMessage> - </pick> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" myRole="CreditAgency"/> + </partnerLinks> + <variables> + <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/> + <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/> + <variable name="invalidCreditFaultVar" messageType="cay:invalidCreditFault"/> + </variables> + <sequence> + <receive partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/> + <if> + <sequence> + <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/> + </sequence> + <else> + <sequence> + <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="invalidCreditFaultVar" faultName="cay:invalidCredit" name="Send_CreditCheckInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD 2011-01-05 16:17:24 UTC (rev 533) @@ -0,0 +1,36 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <partnerLinks> + <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> + </variables> + <sequence> + <pick> + <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar"> + <sequence> + <scope> + <sequence> + <if> + <sequence> + <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/> + </sequence> + <else> + <sequence> + <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/> + </sequence> + </else> + </if> + </sequence> + </scope> + </sequence> + </onMessage> + </pick> + </sequence> +</process>

13 years, 4 months

1
0
0 / 0

savara SVN: r532 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/generator and 3 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 17:28:15 -0500 (Tue, 04 Jan 2011) New Revision: 532 Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD Removed: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 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/ESBBrokerProcess_Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java Log: Updated BPEL 'if' parsing and fixed test. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java 2011-01-04 22:28:15 UTC (rev 532) @@ -53,6 +53,26 @@ if (act != null) { context.convert(act, cb.getBlock().getContents(), journal); + + // Check if first activity is interaction + if (cb.getBlock().getContents().size() > 0 && + cb.getBlock().getContents().get(0) instanceof Interaction) { + Interaction interaction=(Interaction)cb.getBlock().getContents().get(0); + + cb.getBlock().getContents().remove(0); + + cb.derivedFrom(interaction); + + cb.setMessageSignature(interaction.getMessageSignature()); + + elem.setFromRole(interaction.getFromRole()); + + if (interaction.getToRoles().size() > 0) { + elem.setToRole(interaction.getToRoles().get(0)); + } + } else { + journal.error("Main block of if does not contain an initial interaction", null); + } } elem.getWhens().add(cb); @@ -65,6 +85,8 @@ context.convert(elseIfElem, cb.getBlock().getContents(), journal); + setupWhenMs(elem, cb, journal); + elem.getWhens().add(cb); } @@ -74,9 +96,50 @@ context.convert(bpelElem.getElse(), cb.getBlock().getContents(), journal); + setupWhenMs(elem, cb, journal); + elem.getWhens().add(cb); } activities.add(elem); } + + protected void setupWhenMs(Choice elem, When cb, Journal journal) { + + // Check if first activity is interaction + if (cb.getBlock().getContents().size() > 0 && + cb.getBlock().getContents().get(0) instanceof Interaction) { + Interaction interaction=(Interaction)cb.getBlock().getContents().get(0); + + cb.getBlock().getContents().remove(0); + + cb.derivedFrom(interaction); + + cb.setMessageSignature(interaction.getMessageSignature()); + + // Verify from/to roles + if (elem.getFromRole() != null) { + if (interaction.getFromRole() != null) { + if (elem.getFromRole().equals(interaction.getFromRole()) == false) { + journal.error("ElseIf path has interaction with incompatible 'from' role", null); + } + } else { + journal.error("ElseIf path does not contain a required 'from' role", null); + } + } + elem.setFromRole(interaction.getFromRole()); + + if (elem.getToRole() != null) { + if (interaction.getToRoles().size() > 0) { + if (elem.getToRole().equals(interaction.getToRoles().get(0)) == false) { + journal.error("ElseIf path has interaction with incompatible 'to' role", null); + } + } else { + journal.error("ElseIf path does not contain a required 'to' role", null); + } + } + } else { + journal.error("Main block of if does not contain an initial interaction", null); + } + } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 22:28:15 UTC (rev 532) @@ -33,7 +33,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); - + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); 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-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 22:28:15 UTC (rev 532) @@ -34,9 +34,9 @@ TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests"); suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); /* - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv 2011-01-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv 2011-01-04 22:28:15 UTC (rev 532) @@ -1,16 +0,0 @@ -namespace null; - -conversation ESBBrokerProcess_Buyer@Buyer implements LoanBroker@Buyer { - makeEnquiry(enquiry) from Buyer to Broker; - makeEnquiry(quoteList) from Broker to Buyer; - if { - buy(buy) from Buyer to Broker; - if { - buy(bookingReference) from Broker to Buyer; - } else if { - buy(orderRejected) from Broker to Buyer; - } - } else if { - cancel(cancel) from Buyer to Broker; - } -} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.spr 2011-01-04 22:28:15 UTC (rev 532) @@ -0,0 +1,16 @@ +protocol ESBBrokerProcess_Buyer { + makeEnquiry(enquiry) to Broker; + makeEnquiry(quoteList) from Broker; + choice to Broker { + buy(): + choice from Broker { + buy(bookingReference): + + buy(orderRejected): + + } + + cancel(): + + } +} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel 2011-01-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel 2011-01-04 22:28:15 UTC (rev 532) @@ -1,43 +1,39 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> - <partnerLinks> - <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> - </partnerLinks> - <variables> - <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> - <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> - <variable messageType="brk:buyRequest" name="buyRequestVar"/> - <variable messageType="brk:buyResponse" name="buyResponseVar"/> - <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> - </variables> - <sequence> - <invoke inputVariable="makeEnquiryRequestVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - <receive name="Receive_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/> - <if> - <sequence> - <scope> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke inputVariable="buyRequestVar" name="Send_buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - </sequence> - </scope> - </sequence> - </scope> - </sequence> - <else> - <sequence> - <invoke inputVariable="cancelRequestVar" name="Send_cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - </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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Buyer" location="ESBBrokerProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> + </partnerLinks> + <variables> + <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/> + <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/> + <variable name="buyRequestVar" messageType="byr:buyRequest"/> + <variable name="buyResponseVar" messageType="brk:buyResponse"/> + <variable name="cancelRequestVar" messageType="byr:cancelRequest"/> + </variables> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" inputVariable="makeEnquiryRequestVar" outputVariable="makeEnquiryResponseVar" name="Send_enquiry"/> + <if> + <sequence> + <scope> + <faultHandlers> + <catch faultName="brk:rejected" faultVariable="rejectedFaultVar" faultMessageType="brk:rejectedFault"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_buy"/> + </sequence> + </scope> + </sequence> + <else> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="cancel" inputVariable="cancelRequestVar" name="Send_cancel"/> + </sequence> + </else> + </if> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD 2011-01-04 22:28:15 UTC (rev 532) @@ -0,0 +1,43 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> + <partnerLinks> + <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> + </partnerLinks> + <variables> + <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> + <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> + <variable messageType="brk:buyRequest" name="buyRequestVar"/> + <variable messageType="brk:buyResponse" name="buyResponseVar"/> + <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> + </variables> + <sequence> + <invoke inputVariable="makeEnquiryRequestVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + <receive name="Receive_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/> + <if> + <sequence> + <scope> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke inputVariable="buyRequestVar" name="Send_buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + </sequence> + </scope> + </sequence> + </scope> + </sequence> + <else> + <sequence> + <invoke inputVariable="cancelRequestVar" name="Send_cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + </sequence> + </else> + </if> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-04 22:28:15 UTC (rev 532) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> - <wsdl:import location="ESBBrokerProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> +  <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>

13 years, 4 months

1
0
0 / 0

savara SVN: r531 - in branches/experimental/2.0.x/bundles: org.savara.bpel/src/main/java/org/savara/bpel/parser and 8 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 16:53:07 -0500 (Tue, 04 Jan 2011) New Revision: 531 Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ 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/ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/LoanApprovalService(a)Service.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv 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 branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/LoanApprovalService(a)Service.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl 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.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl 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_BuyerArtifacts.wsdl 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.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl Removed: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/OnMessageGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/results/ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/testmodels/ Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java Log: Setup initial parser test, and update BPEL parser rules to use the journal and report particular issues that prevent the creation of a valid protocol model. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ConversionContext.java 2011-01-04 21:53:07 UTC (rev 531) @@ -20,6 +20,7 @@ import org.savara.bpel.model.TProcess; import org.savara.bpel.model.TScope; import org.savara.bpel.model.TVariable; +import org.scribble.common.logging.Journal; import org.scribble.common.resource.ResourceLocator; import org.scribble.protocol.model.Activity; @@ -31,7 +32,7 @@ * @param component The domain component * @param activities The list of protocol activities to place the conversion results */ - public void convert(Object component, java.util.List<Activity> activities); + public void convert(Object component, java.util.List<Activity> activities, Journal journal); /** * This method returns a reference to the resource locator. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/DefaultConversionContext.java 2011-01-04 21:53:07 UTC (rev 531) @@ -20,6 +20,7 @@ import org.savara.bpel.model.TProcess; import org.savara.bpel.model.TScope; import org.savara.bpel.model.TVariable; +import org.scribble.common.logging.Journal; import org.scribble.common.resource.ResourceLocator; import org.scribble.protocol.model.Activity; @@ -45,7 +46,7 @@ m_rules.add(new FlowGenerationRule()); m_rules.add(new IfGenerationRule()); m_rules.add(new InvokeGenerationRule()); - m_rules.add(new OnMessageGenerationRule()); + //m_rules.add(new OnMessageGenerationRule()); m_rules.add(new PickGenerationRule()); m_rules.add(new ProcessGenerationRule()); m_rules.add(new ReceiveGenerationRule()); @@ -75,7 +76,7 @@ * @param component The domain component * @param activities The list of protocol activities to place the conversion results */ - public void convert(Object component, java.util.List<Activity> activities) { + public void convert(Object component, java.util.List<Activity> activities, Journal journal) { ProtocolGenerationRule rule=null; for (int i=0; rule == null && i < m_rules.size(); i++) { @@ -85,7 +86,7 @@ } if (rule != null) { - rule.convert(this, component, activities); + rule.convert(this, component, activities, journal); } } @@ -169,6 +170,6 @@ * @return The scope, or null if not within a scope */ public TScope getScope() { - return(m_scopeStack.peek()); + return(m_scopeStack.size() > 0 ? m_scopeStack.peek() : null); } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -22,6 +22,7 @@ import org.savara.bpel.model.TActivity; import org.savara.bpel.model.TActivityContainer; import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.Activity; /** @@ -34,13 +35,14 @@ return(component instanceof TActivityContainer); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TActivityContainer container=(TActivityContainer)component; TActivity act=ActivityUtil.getActivity(container); if (act != null) { - context.convert(act, activities); + context.convert(act, activities, journal); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ElseifGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -22,6 +22,7 @@ import org.savara.bpel.model.TActivity; import org.savara.bpel.model.TElseif; import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.Activity; /** @@ -34,13 +35,14 @@ return(component instanceof TElseif); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TElseif container=(TElseif)component; TActivity act=ActivityUtil.getActivity(container); if (act != null) { - context.convert(act, activities); + context.convert(act, activities, journal); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/FlowGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -20,6 +20,7 @@ import java.util.List; import org.savara.bpel.model.TFlow; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -32,7 +33,8 @@ return(component instanceof TFlow); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TFlow elem=(TFlow)component; //getSource().setComponentURI(getURI()); @@ -74,7 +76,7 @@ for (int i=0; i < elem.getActivity().size(); i++) { Block b=new Block(); - context.convert(elem.getActivity().get(i), b.getContents()); + context.convert(elem.getActivity().get(i), b.getContents(), journal); parallel.getBlocks().add(b); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/IfGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -23,6 +23,7 @@ import org.savara.bpel.model.TElseif; import org.savara.bpel.model.TIf; import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -35,7 +36,8 @@ return(component instanceof TIf); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TIf bpelElem=(TIf)component; //getSource().setComponentURI(getURI()); @@ -50,7 +52,7 @@ TActivity act=ActivityUtil.getActivity(bpelElem); if (act != null) { - context.convert(act, cb.getBlock().getContents()); + context.convert(act, cb.getBlock().getContents(), journal); } elem.getWhens().add(cb); @@ -61,7 +63,7 @@ cb = new When(); - context.convert(elseIfElem, cb.getBlock().getContents()); + context.convert(elseIfElem, cb.getBlock().getContents(), journal); elem.getWhens().add(cb); } @@ -70,7 +72,7 @@ if (bpelElem.getElse() != null) { cb = new When(); - context.convert(bpelElem.getElse(), cb.getBlock().getContents()); + context.convert(bpelElem.getElse(), cb.getBlock().getContents(), journal); elem.getWhens().add(cb); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/InvokeGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -28,6 +28,7 @@ import org.savara.bpel.util.InteractionUtil; import org.savara.bpel.util.PartnerLinkUtil; import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -41,7 +42,8 @@ return(component instanceof TInvoke); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TInvoke invoke=(TInvoke)component; //getSource().setComponentURI(getURI()); Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/OnMessageGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/OnMessageGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/OnMessageGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.generator.protocol; - -import java.util.List; - -import org.savara.bpel.model.TActivity; -import org.savara.bpel.model.TOnMessage; -import org.savara.bpel.model.TVariable; -import org.savara.bpel.util.ActivityUtil; -import org.savara.bpel.util.InteractionUtil; -import org.savara.bpel.util.PartnerLinkUtil; -import org.savara.bpel.util.TypeReferenceUtil; -import org.scribble.protocol.model.*; - -/** - * This class represents the 'onMessage' construct contained - * within the 'pick' activity. - */ -public class OnMessageGenerationRule implements ProtocolGenerationRule { - - public boolean isSupported(Object component) { - return(component instanceof TOnMessage); - } - - public void convert(ConversionContext context, Object component, List<Activity> activities) { - TOnMessage elem=(TOnMessage)component; - - Interaction interaction=new Interaction(); - - TVariable var=context.getVariable(elem.getVariable()); - - String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); - - TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); - - MessageSignature ms=new MessageSignature(); - ms.setOperation(elem.getOperation()); - ms.getTypeReferences().add(tref); - - String fromRole=PartnerLinkUtil.getServerPartnerRole(elem.getPartnerLink()); - - if (fromRole != null) { - interaction.setFromRole(new Role(fromRole)); - } - - if (context.getRole() != null) { - interaction.getToRoles().add(new Role(context.getRole())); - } - - interaction.setMessageSignature(ms); - - activities.add(interaction); - - TActivity act=ActivityUtil.getActivity(elem); - - if (act != null) { - context.convert(act, activities); - } - } -} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/PickGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -19,9 +19,16 @@ import java.util.List; +import org.savara.bpel.model.TActivity; import org.savara.bpel.model.TOnMessage; import org.savara.bpel.model.TPick; import org.savara.bpel.model.TReply; +import org.savara.bpel.model.TVariable; +import org.savara.bpel.util.ActivityUtil; +import org.savara.bpel.util.InteractionUtil; +import org.savara.bpel.util.PartnerLinkUtil; +import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -32,10 +39,11 @@ public class PickGenerationRule implements ProtocolGenerationRule { public boolean isSupported(Object component) { - return(component instanceof TReply); + return(component instanceof TPick); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TPick pick=(TPick)component; //getSource().setComponentURI(getURI()); @@ -43,14 +51,54 @@ org.scribble.protocol.model.Choice elem= new org.scribble.protocol.model.Choice(); + Role fromRole=null; + // Convert 'onMessage' paths for (int i=0; i < pick.getOnMessage().size(); i++) { TOnMessage onMessageElem=pick.getOnMessage().get(i); When cb = new When(); - context.convert(onMessageElem, cb.getBlock().getContents()); + context.convert(onMessageElem, cb.getBlock().getContents(), journal); + String fromRoleName=PartnerLinkUtil.getServerPartnerRole(onMessageElem.getPartnerLink()); + + if (i == 0) { + // Obtain from/to roles + if (fromRoleName != null) { + fromRole = new Role(fromRoleName); + } + } else { + // TODO: Check 'from role' for other paths + if (fromRoleName != null && + fromRole != null && + fromRoleName.equals(fromRole.getName()) == false) { + journal.error("Pick path has different from roles", null); + } + } + + elem.setFromRole(fromRole); + + TVariable var=context.getVariable(onMessageElem.getVariable()); + + String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), + context.getResourceLocator()); + + TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); + + MessageSignature ms=new MessageSignature(); + ms.setOperation(onMessageElem.getOperation()); + ms.getTypeReferences().add(tref); + + cb.setMessageSignature(ms); + + // Process the contained activities + TActivity act=ActivityUtil.getActivity(onMessageElem); + + if (act != null) { + context.convert(act, cb.getBlock().getContents(), journal); + } + elem.getWhens().add(cb); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProcessGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -29,6 +29,7 @@ import org.savara.bpel.model.TVariable; import org.savara.bpel.util.ActivityUtil; import org.savara.bpel.util.InteractionUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -42,7 +43,8 @@ return(component instanceof TProcess); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TProcess process=(TProcess)component; // Add variables to the context @@ -78,7 +80,8 @@ // Include remaining activities if (act instanceof TSequence) { for (int i=1; i < ((TSequence)act).getActivity().size(); i++) { - context.convert(((TSequence)act).getActivity().get(i), cb.getBlock().getContents()); + context.convert(((TSequence)act).getActivity().get(i), cb.getBlock().getContents(), + journal); } } @@ -113,7 +116,7 @@ TActivity cbact=ActivityUtil.getActivity(catchBlock); if (cbact != null) { - context.convert(cbact, fcb.getBlock().getContents()); + context.convert(cbact, fcb.getBlock().getContents(), journal); } choice.getWhens().add(fcb); @@ -170,7 +173,7 @@ TActivity cbact=ActivityUtil.getActivity(catchPath); if (cbact != null) { - context.convert(cbact, cb.getBlock().getContents()); + context.convert(cbact, cb.getBlock().getContents(), journal); } if (faultVar != null) { @@ -183,7 +186,7 @@ // Convert normal activities in scope if (act != null) { - context.convert(act, acts); + context.convert(act, acts, journal); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ProtocolGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -17,6 +17,7 @@ */ package org.savara.bpel.generator.protocol; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.Activity; /** @@ -44,6 +45,7 @@ * @param component The domain component * @param activities The list of protocol activities */ - public void convert(ConversionContext context, Object component, java.util.List<Activity> activities); + public void convert(ConversionContext context, Object component, java.util.List<Activity> activities, + Journal journal); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReceiveGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -24,6 +24,7 @@ import org.savara.bpel.util.InteractionUtil; import org.savara.bpel.util.PartnerLinkUtil; import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -38,7 +39,8 @@ return(component instanceof TReceive); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TReceive elem=(TReceive)component; //getSource().setComponentURI(getURI()); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ReplyGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -24,6 +24,7 @@ import org.savara.bpel.util.InteractionUtil; import org.savara.bpel.util.PartnerLinkUtil; import org.savara.bpel.util.TypeReferenceUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -37,7 +38,8 @@ return(component instanceof TReply); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TReply reply=(TReply)component; //getSource().setComponentURI(getURI()); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/ScopeGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -29,6 +29,7 @@ import org.savara.bpel.model.TVariable; import org.savara.bpel.util.ActivityUtil; import org.savara.bpel.util.InteractionUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -42,14 +43,17 @@ return(component instanceof TScope); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TScope scope=(TScope)component; //getSource().setComponentURI(getURI()); // Add variables to the context - for (int i=0; i < scope.getVariables().getVariable().size(); i++) { - context.addVariable(scope.getVariables().getVariable().get(i)); + if (scope.getVariables() != null) { + for (int i=0; i < scope.getVariables().getVariable().size(); i++) { + context.addVariable(scope.getVariables().getVariable().get(i)); + } } // Count number of invoke activities @@ -60,7 +64,7 @@ // no event handlers TInvoke invoke=null; - if (invokeCount == 1 && + if (//invokeCount == 1 && scope.getFaultHandlers() != null && (scope.getFaultHandlers().getCatch().size() > 0 || scope.getFaultHandlers().getCatchAll() != null) && (scope.getEventHandlers() == null || (scope.getEventHandlers().getOnEvent().size() == 0 && @@ -76,11 +80,20 @@ InvokeGenerationRule.convertResponse(invoke, cb.getBlock().getContents(), context); + if (cb.getBlock().getContents().size() > 0) { + Interaction resp=(Interaction)cb.getBlock().getContents().get(0); + cb.getBlock().getContents().remove(resp); + + cb.setMessageSignature(resp.getMessageSignature()); + + choice.setFromRole(resp.getFromRole()); + } + // Include remaining activities if (scope.getSequence() != null) { for (int i=1; i < ((TSequence)scope.getSequence()).getActivity().size(); i++) { context.convert(((TSequence)scope.getSequence()).getActivity().get(i), - cb.getBlock().getContents()); + cb.getBlock().getContents(), journal); } } @@ -110,11 +123,25 @@ InvokeGenerationRule.convertFaultResponse(invoke, fcb.getBlock().getContents(), catchBlock.getFaultVariable(), mesgType, context); + + if (fcb.getBlock().getContents().size() > 0) { + Interaction resp=(Interaction)fcb.getBlock().getContents().get(0); + fcb.getBlock().getContents().remove(resp); + + fcb.setMessageSignature(resp.getMessageSignature()); + + // Validate from role + if (resp.getFromRole() != null && + choice.getFromRole() != null && + resp.getFromRole().equals(choice.getFromRole()) == false) { + journal.error("Fault handler 'from role' not same as normal response", null); + } + } TActivity act=ActivityUtil.getActivity(catchBlock); if (act != null) { - context.convert(act, fcb.getBlock().getContents()); + context.convert(act, fcb.getBlock().getContents(), journal); } choice.getWhens().add(fcb); @@ -171,7 +198,7 @@ TActivity act=ActivityUtil.getActivity(catchPath); if (act != null) { - context.convert(act, cb.getBlock().getContents()); + context.convert(act, cb.getBlock().getContents(), journal); } if (faultVar != null) { @@ -186,7 +213,7 @@ TActivity act=ActivityUtil.getActivity(scope); if (act != null) { - context.convert(act, acts); + context.convert(act, acts, journal); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/SequenceGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -20,6 +20,7 @@ import java.util.List; import org.savara.bpel.model.TSequence; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -33,13 +34,14 @@ return(component instanceof TSequence); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TSequence bpelElem=(TSequence)component; //getSource().setComponentURI(getURI()); for (int i=0; i < bpelElem.getActivity().size(); i++) { - context.convert(bpelElem.getActivity().get(i), activities); + context.convert(bpelElem.getActivity().get(i), activities, journal); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/WhileGenerationRule.java 2011-01-04 21:53:07 UTC (rev 531) @@ -22,6 +22,7 @@ import org.savara.bpel.model.TActivity; import org.savara.bpel.model.TWhile; import org.savara.bpel.util.ActivityUtil; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; /** @@ -35,7 +36,8 @@ return(component instanceof TWhile); } - public void convert(ConversionContext context, Object component, List<Activity> activities) { + public void convert(ConversionContext context, Object component, List<Activity> activities, + Journal journal) { TWhile bpelElem=(TWhile)component; //getSource().setComponentURI(getURI()); @@ -48,7 +50,7 @@ TActivity act=ActivityUtil.getActivity(bpelElem); if (act != null) { - context.convert(act, elem.getBlock().getContents()); + context.convert(act, elem.getBlock().getContents(), journal); } activities.add(elem); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-04 21:53:07 UTC (rev 531) @@ -50,6 +50,7 @@ //ret.getBlock().derivedFrom(this); Protocol protocol=new Protocol(); + ret.setProtocol(protocol); // Configure model name protocol.setName(process.getName()); @@ -61,7 +62,7 @@ // Convert the process contents DefaultConversionContext context=new DefaultConversionContext(role, process, locator); - context.convert(process, protocol.getBlock().getContents()); + context.convert(process, protocol.getBlock().getContents(), journal); return(ret); } Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 21:53:07 UTC (rev 531) @@ -1,265 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.savara.bpel.parser; - -import java.net.URI; - -import org.savara.util.ScribbleServices; -import org.scribble.common.logging.CachedJournal; -import org.scribble.common.resource.ResourceLocator; -import org.scribble.protocol.model.ProtocolModel; - -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; - -public class ParserTest extends TestCase { - - public static TestSuite suite() { - TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); - - /* - suite.addTest(new BPELToConversationTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); - suite.addTest(new BPELToConversationTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); - suite.addTest(new BPELToConversationTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); - suite.addTest(new BPELToConversationTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); - suite.addTest(new BPELToConversationTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); - suite.addTest(new BPELToConversationTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods@Buyer")); - suite.addTest(new BPELToConversationTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods@CreditAgency")); - suite.addTest(new BPELToConversationTest("PurchaseGoodsProcess_Store", "PurchaseGoods@Store")); - suite.addTest(new BPELToConversationTest("ReqRespFaultProcess_Buyer", "ReqRespFault@Buyer")); - suite.addTest(new BPELToConversationTest("ReqRespFaultProcess_Seller", "ReqRespFault@Seller")); - - /** - * TODO: (SAVARA-150) Commenting out this test for now, as we now need the accompanying WSDL to be able to - * resolve the message type's underlying XSD element or type. - * - suite.addTest(new BPELToConversationTest("LoanApprovalService@Service", "LoanApprovalService@Service")); - */ - - return suite; - } - - /** - * The test case for running the BPEL to Conversation test. - */ - protected static class BPELToConversationTest extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - */ - public BPELToConversationTest(String bpelName, String scvName) { - super(bpelName+"->"+scvName); - m_bpelName = bpelName; - m_scvName = scvName; - } - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="testmodels/"+m_bpelName+".bpel"; - - java.io.InputStream is= - ParserTest.class.getResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - CachedJournal journal=new CachedJournal(); - - org.scribble.protocol.model.ProtocolModel model=null; - - try { - model = ScribbleServices.getParserManager().parse("bpel", is, journal, new ResourceLoaderImpl()); - } catch(Exception e) { - result.addError(this, new Throwable("Parsing BPEL failed")); - } - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - - } else if (journal.hasErrors()) { - result.addError(this, new Throwable("Failed to parse CDM Model")); - - for (int i=0; i < journal.getIssues().size(); i++) { - System.err.println("Issue: "+ - journal.getIssues().get(i).getMessage()); - } - } else { - ProtocolModel lm=(ProtocolModel)model; - - try { - org.scribble.protocol.export.ProtocolExporter exporter= - ScribbleServices.getProtocolExportManager().getExporter("spr"); - - java.io.ByteArrayOutputStream os= - new java.io.ByteArrayOutputStream(); - - exporter.export(lm, journal, os); - - os.close(); - - String str=new String(os.toByteArray()); - - checkResults(result, str); - - } catch(Exception e) { - e.printStackTrace(); - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated jboss-esb.xml against a - * previously stored correct version. - * - * @param result The test result - * @param conv The conversation - */ - protected void checkResults(TestResult result, String conv) { - boolean f_valid=false; - - String filename="results/"+m_scvName+".scv"; - - java.io.InputStream is= - ParserTest.class.getResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(conv) == false) { - result.addError(this, - new Throwable("Generated Conversation does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting Conversation '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="testmodels/"+m_bpelName+".bpel"; - - java.net.URL url=ParserTest.class.getResource(bpelfile); - - /* - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - */ - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/plugintest")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, m_scvName+".expected"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(conv.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Expected output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ - m_bpelName+"': "+url)); - } - } - } - } - - private String m_bpelName=null; - private String m_scvName=null; - } - - public static class ResourceLoaderImpl implements ResourceLocator { - - public ResourceLoaderImpl() { - } - - public URI getResourceURI(String uri) { - String filename="testmodels/"+uri; - - java.net.URI ret=null; - - try { - ret = ParserTest.class.getResource(filename).toURI(); - } catch(Exception e) { - e.printStackTrace(); - } - - return(ret); - } - - } -} Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 17:44:48 UTC (rev 530) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 21:53:07 UTC (rev 531) @@ -23,14 +23,10 @@ import junit.framework.TestSuite; import org.savara.util.PropertyNames; -import org.savara.util.ScribbleServices; import org.savara.bpel.model.TProcess; import org.savara.bpel.util.BPELModelUtil; import org.savara.model.generator.ModelGenerator; -import org.savara.util.XMLUtils; import org.scribble.common.logging.CachedJournal; -import org.scribble.protocol.model.Protocol; -import org.scribble.protocol.model.ProtocolModel; import org.savara.pi4soa.cdm.parser.CDMProtocolParser; public class GeneratorTest { @@ -50,7 +46,7 @@ suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller")); - + return suite; } Added: 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 (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,273 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.savara.bpel.parser; + +import java.net.URI; + +import org.savara.util.ScribbleServices; +import org.scribble.common.logging.CachedJournal; +import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.model.ProtocolModel; + +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +public class ParserTest extends TestCase { + + public static TestSuite suite() { + TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests"); + + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); + + /* + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); + suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); + suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); + 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 + * resolve the message type's underlying XSD element or type. + * + suite.addTest(new BPELToConversationTest("LoanApprovalService@Service", "LoanApprovalService@Service")); + */ + + return suite; + } + + /** + * The test case for running the BPEL to Protocol test. + */ + protected static class BPELToProtocolTest extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + */ + public BPELToProtocolTest(String bpelName, String scvName) { + super(bpelName+"->"+scvName); + m_bpelName = bpelName; + m_scvName = scvName; + } + + /** + * This method runs the test. + * + * @param result The test result + */ + public void run(TestResult result) { + result.startTest(this); + + String filename="parser/testmodels/"+m_bpelName+".bpel"; + + java.io.InputStream is= + //ParserTest.class.getResourceAsStream(filename); + ClassLoader.getSystemResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + CachedJournal journal=new CachedJournal(); + + org.scribble.protocol.model.ProtocolModel model=null; + + try { + BPELProtocolParser parser=new BPELProtocolParser(); + + model = parser.parse(is, journal, new ResourceLoaderImpl()); + } catch(Exception e) { + e.printStackTrace(); + result.addError(this, new Throwable("Parsing BPEL failed")); + } + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + + } else if (journal.hasErrors()) { + result.addError(this, new Throwable("Failed to parse CDM Model")); + + for (int i=0; i < journal.getIssues().size(); i++) { + System.err.println("Issue: "+ + journal.getIssues().get(i).getMessage()); + } + } else { + ProtocolModel lm=(ProtocolModel)model; + + try { + org.scribble.protocol.export.text.TextProtocolExporter exporter= + new org.scribble.protocol.export.text.TextProtocolExporter(); + + java.io.ByteArrayOutputStream os= + new java.io.ByteArrayOutputStream(); + + exporter.export(lm, journal, os); + + os.close(); + + String str=new String(os.toByteArray()); + + checkResults(result, str); + + } catch(Exception e) { + e.printStackTrace(); + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated jboss-esb.xml against a + * previously stored correct version. + * + * @param result The test result + * @param conv The conversation + */ + protected void checkResults(TestResult result, String conv) { + boolean f_valid=false; + + String filename="parser/results/"+m_scvName+".spr"; + + java.io.InputStream is= + //ParserTest.class.getResourceAsStream(filename); + ClassLoader.getSystemResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(conv) == false) { + result.addError(this, + new Throwable("Generated protocol does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting protocol '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="parser/testmodels/"+m_bpelName+".bpel"; + + java.net.URL url=//ParserTest.class.getResource(bpelfile); + ClassLoader.getSystemResource(bpelfile); + + /* + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + */ + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, m_scvName+".generated"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(conv.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Generated output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ + m_bpelName+"': "+url)); + } + } + } + } + + private String m_bpelName=null; + private String m_scvName=null; + } + + public static class ResourceLoaderImpl implements ResourceLocator { + + public ResourceLoaderImpl() { + } + + public URI getResourceURI(String uri) { + String filename="parser/testmodels/"+uri; + + java.net.URI ret=null; + + try { + ret = ClassLoader.getSystemResource(filename).toURI(); + } catch(Exception e) { + e.printStackTrace(); + } + + return(ret); + } + + } +} Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Broker.spr 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,25 @@ +protocol ESBBrokerProcess_Broker { + makeEnquiry(enquiry) from Buyer; + repeat { + getQuote(requestForQuote) to SupplierQuoteEngine; + getQuote(quote) from SupplierQuoteEngine; + } + makeEnquiry(quoteList) to Buyer; + choice from Buyer { + buy(buy): + checkCredit(CreditCheckRequest) to CreditAgency; + choice from CreditAgency { + checkCredit(CreditCheckOk): + confirm(orderConfirmed) to SupplierTxnProcessor; + confirm(bookingReference) from SupplierTxnProcessor; + buy(bookingReference) to Buyer; + + checkCredit(CreditCheckInvalid): + buy(orderRejected) to Buyer; + + } + + cancel(cancel): + + } +} Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)Buyer.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,16 @@ +namespace null; + +conversation ESBBrokerProcess_Buyer@Buyer implements LoanBroker@Buyer { + makeEnquiry(enquiry) from Buyer to Broker; + makeEnquiry(quoteList) from Broker to Buyer; + if { + buy(buy) from Buyer to Broker; + if { + buy(bookingReference) from Broker to Buyer; + } else if { + buy(orderRejected) from Broker to Buyer; + } + } else if { + cancel(cancel) from Buyer to Broker; + } +} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)CreditAgency.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,12 @@ +namespace null; + +conversation ESBBrokerProcess_CreditAgency@CreditAgency implements Common@CreditAgency { + if { + checkCredit(CreditCheckRequest) from Broker to CreditAgency; + if { + checkCredit(CreditCheckOk) from CreditAgency to Broker; + } else if { + checkCredit(CreditCheckInvalid) from CreditAgency to Broker; + } + } +} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierQuoteEngine.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,6 @@ +namespace null; + +conversation RequestForQuote_SupplierQuoteEngine@SupplierQuoteEngine implements LoanBroker@SupplierQuoteEngine { + getQuote(requestForQuote) from Broker to SupplierQuoteEngine; + getQuote(quote) from SupplierQuoteEngine to Broker; +} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker(a)SupplierTxnProcessor.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,8 @@ +namespace null; + +conversation CompleteTransaction_SupplierTxnProcessor@SupplierTxnProcessor implements LoanBroker@SupplierTxnProcessor { + if { + confirm(orderConfirmed) from Broker to SupplierTxnProcessor; + confirm(bookingReference) from SupplierTxnProcessor to Broker; + } +} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/LoanApprovalService(a)Service.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/LoanApprovalService(a)Service.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/LoanApprovalService(a)Service.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,41 @@ +namespace null; + +conversation loanApprovalProcess { + try { + boolean receive-to-assess, receive-to-approval, approval-to-reply, assess-to-setMessage, setMessage-to-reply, assess-to-approval; + parallel { + request(creditInformationMessage) from customer; + receive-to-assess = xpath[true()]; + receive-to-approval = xpath[true()]; + } and { + when (xpath[$receive-to-assess]) { + check(creditInformationMessage) to assessor; + if { + check(riskAssessmentMessage) from assessor; + } else if { + check(errorMessage) from assessor; + raise lns:loanProcessFault; + } + assess-to-setMessage = xpath[true()]; + assess-to-approval = xpath[true()]; + } + } and { + when (xpath[$receive-to-approval and $assess-to-approval]) { + approve(creditInformationMessage) to approver; + if { + approve(approvalMessage) from approver; + } else if { + approve(errorMessage) from approver; + raise lns:loanProcessFault; + } + approval-to-reply = xpath[true()]; + } + } and { + when (xpath[$setMessage-to-reply and $approval-to-reply]) { + request(approvalMessage) to customer; + } + } + } catch lns:loanProcessFault { + request(errorMessage) to customer; + } +} \ No newline at end of file Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Buyer.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,10 @@ +namespace null; + +conversation PurchaseGoodsProcess_Buyer@Buyer implements Purchasing@Buyer { + buy(BuyRequest) from Buyer to Store; + if { + buy(BuyConfirmed) from Store to Buyer; + } else if { + 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)CreditAgency.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)CreditAgency.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,10 @@ +namespace null; + +conversation PurchaseGoodsProcess_CreditAgency@CreditAgency implements Common@CreditAgency { + checkCredit(CreditCheckRequest) from Store to CreditAgency; + if { + checkCredit(CreditCheckOk) from CreditAgency to Store; + } else if { + checkCredit(CreditCheckInvalid) from CreditAgency to Store; + } +} \ 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.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,13 @@ +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/ReqRespFault(a)Buyer.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,10 @@ +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)Seller.scv =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,10 @@ +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/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,20 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <partnerLinks> + <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> + <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> + </variables> + <sequence> + <pick createInstance="yes"> + <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar"> + <sequence> + <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/> + </sequence> + </onMessage> + </pick> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <wsdl:import location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorServiceLT"> + <plnk:role name="SupplierTxnProcessorService" portType="ns1:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_BrokerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT" myRole="BrokerBehavior"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> + </partnerLinks> + <variables> + <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/> + <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/> + <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/> + <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/> + <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/> + <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/> + <variable name="confirmRequestVar" messageType="spr:confirmRequest"/> + <variable name="confirmResponseVar" messageType="spr:confirmResponse"/> + <variable name="buyResponseVar" messageType="brk:buyResponse"/> + <variable name="rejectedFaultVar" messageType="brk:rejectedFault"/> + <variable name="buyRequestVar" messageType="brk:buyRequest"/> + <variable name="cancelRequestVar" messageType="brk:cancelRequest"/> + </variables> + <sequence> + <receive partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" variable="makeEnquiryRequestVar" createInstance="yes" name="Receive_enquiry"/> + <while> + <sequence> + <scope> + <sequence> + <invoke partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" inputVariable="getQuoteRequestVar" outputVariable="getQuoteResponseVar" name="Send_requestForQuote"/> + </sequence> + </scope> + </sequence> + </while> + <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" variable="makeEnquiryResponseVar" name="Send_quoteList"/> + <pick> + <onMessage partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyRequestVar"> + <sequence> + <scope> + <faultHandlers> + <catch faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar" faultMessageType="cay:invalidCreditFault"> +<sequence> + <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="rejectedFaultVar" faultName="brk:rejected" name="Send_orderRejected"/> +</sequence> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/> + <invoke partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" inputVariable="confirmRequestVar" outputVariable="confirmResponseVar" name="Send_orderConfirmed"/> + <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyResponseVar" name="Send_bookingReference"/> + </sequence> + </scope> + </sequence> + </onMessage> + <onMessage partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="cancel" variable="cancelRequestVar"> + <sequence/> + </onMessage> + </pick> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,66 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BrokerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <partnerLinks> + <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> + </partnerLinks> + <variables> + <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> + <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> + <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> + <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> + <variable messageType="brk:buyRequest" name="buyRequestVar"/> + <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> + <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> + <variable messageType="brk:buyResponse" name="buyResponseVar"/> + <variable messageType="brk:rejectedFault" name="rejectedFaultVar"/> + <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> + </variables> + <sequence> + <receive createInstance="yes" name="Receive_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryRequestVar"/> + <while> + <sequence> + <scope> + <sequence> + <invoke inputVariable="getQuoteRequestVar" name="Send_requestForQuote" operation="getQuote" outputVariable="getQuoteResponseVar" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior"/> + </sequence> + </scope> + </sequence> + </while> + <reply name="Send_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/> + <pick> + <onMessage operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="buyRequestVar"> + <sequence> + <scope> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="cay:invalidCreditFault" faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar"> + <sequence> + <reply faultName="brk:rejected" name="Send_orderRejected" operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="rejectedFaultVar"/> + </sequence> + </catch> + </faultHandlers> + <sequence> + <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior"/> + <invoke inputVariable="confirmRequestVar" name="Send_orderConfirmed" operation="confirm" outputVariable="confirmResponseVar" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior"/> + <reply name="Send_bookingReference" operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="buyResponseVar"/> + </sequence> + </scope> + </sequence> + </scope> + </sequence> + </onMessage> + <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="cancelRequestVar"> + <sequence/> + </onMessage> + </pick> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="rejectedFault"> + <wsdl:part element="orderRejected" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="makeEnquiryRequest"> + <wsdl:part element="enquiry" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="makeEnquiryResponse"> + <wsdl:part element="quoteList" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyRequest"> + <wsdl:part element="buy" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="cancelRequest"> + <wsdl:part element="cancel" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="BrokerBehavior"> + <wsdl:operation name="buy"> + <wsdl:input message="brk:buyRequest"> + </wsdl:input> + <wsdl:output message="brk:buyResponse"> + </wsdl:output> + <wsdl:fault message="brk:rejectedFault" name="rejected"> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="makeEnquiry"> + <wsdl:input message="brk:makeEnquiryRequest"> + </wsdl:input> + <wsdl:output message="brk:makeEnquiryResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="cancel"> + <wsdl:input message="brk:cancelRequest"> + </wsdl:input> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="BrokerBehaviorBinding" type="brk:BrokerBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="buy"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/buy"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="rejected"> + <soap:fault name="rejected" use="literal"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="makeEnquiry"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/makeEnquiry"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="cancel"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/cancel"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="BrokerService"> + <wsdl:port binding="brk:BrokerBehaviorBinding" name="BrokerBehaviorPort"> + <soap:address location="http://localhost:8080/BrokerService/BrokerBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:ns3="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BuyerToBrokerServiceLT"> + <plnk:role name="BrokerBehavior" portType="ns1:BrokerBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineLT"> + <plnk:role name="SupplierQuoteEngineRequester" portType="ns2:SupplierBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToCreditAgencyLT"> + <plnk:role name="CreditAgencyRequester" portType="ns3:CreditAgencyBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorLT"> + <plnk:role name="SupplierTxnProcessorRequester" portType="ns2:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,43 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> + <partnerLinks> + <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> + </partnerLinks> + <variables> + <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> + <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> + <variable messageType="brk:buyRequest" name="buyRequestVar"/> + <variable messageType="brk:buyResponse" name="buyResponseVar"/> + <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> + </variables> + <sequence> + <invoke inputVariable="makeEnquiryRequestVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + <receive name="Receive_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/> + <if> + <sequence> + <scope> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke inputVariable="buyRequestVar" name="Send_buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + </sequence> + </scope> + </sequence> + </scope> + </sequence> + <else> + <sequence> + <invoke inputVariable="cancelRequestVar" name="Send_cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> + </sequence> + </else> + </if> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> + <wsdl:import location="ESBBrokerProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BuyerToBrokerLT"> + <plnk:role name="BrokerRequester" portType="ns1:BrokerBehavior"/> + <plnk:role name="BrokerBehavior" portType="ns2:BuyerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,36 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <partnerLinks> + <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> + </variables> + <sequence> + <pick> + <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar"> + <sequence> + <scope> + <sequence> + <if> + <sequence> + <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/> + </sequence> + <else> + <sequence> + <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/> + </sequence> + </else> + </if> + </sequence> + </scope> + </sequence> + </onMessage> + </pick> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditResponse"> + <wsdl:part element="CreditCheckOk" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditRequest"> + <wsdl:part element="CreditCheckRequest" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="invalidCreditFault"> + <wsdl:part element="CreditCheckInvalid" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="CreditAgencyBehavior"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="cay:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="cay:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="cay:invalidCreditFault" name="invalidCredit"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="CreditAgencyBehaviorBinding" type="cay:CreditAgencyBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/CreditAgency/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="invalidCredit"> + <soap:fault name="invalidCredit" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="CreditAgencyService"> + <wsdl:port binding="cay:CreditAgencyBehaviorBinding" name="CreditAgencyBehaviorPort"> + <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToCreditAgencyServiceLT"> + <plnk:role name="CreditAgencyService" portType="ns1:CreditAgencyBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/LoanApprovalService(a)Service.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/LoanApprovalService(a)Service.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/LoanApprovalService(a)Service.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,123 @@ +<process name="loanApprovalProcess" + targetNamespace="http://example.com/loan-approval/" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:lns="http://example.com/loan-approval/wsdl/" + suppressJoinFailure="yes"> + <import importType="http://schemas.xmlsoap.org/wsdl/" + location="loanServicePT.wsdl" + namespace="http://example.com/loan-approval/wsdl/" /> + <partnerLinks> + <partnerLink name="customer" + partnerLinkType="lns:loanPartnerLT" + myRole="loanService" /> + <partnerLink name="approver" + partnerLinkType="lns:loanApprovalLT" + partnerRole="approver" /> + <partnerLink name="assessor" + partnerLinkType="lns:riskAssessmentLT" + partnerRole="assessor" /> + </partnerLinks> + <variables> + <variable name="request" + messageType="lns:creditInformationMessage" /> + <variable name="risk" + messageType="lns:riskAssessmentMessage" /> + <variable name="approval" + messageType="lns:approvalMessage" /> + </variables> + <faultHandlers> + <catch faultName="lns:loanProcessFault" + faultVariable="error" + faultMessageType="lns:errorMessage"> + <reply partnerLink="customer" + portType="lns:loanServicePT" + operation="request" variable="error" + faultName="unableToHandleRequest" /> + </catch> + </faultHandlers> + <flow> + <links> + <link name="receive-to-assess" /> + <link name="receive-to-approval" /> + <link name="approval-to-reply" /> + <link name="assess-to-setMessage" /> + <link name="setMessage-to-reply" /> + <link name="assess-to-approval" /> + </links> + <receive partnerLink="customer" + portType="lns:loanServicePT" + operation="request" + variable="request" + createInstance="yes"> + <sources> + <source linkName="receive-to-assess"> + <transitionCondition> + $request.amount < 10000 + </transitionCondition> + </source> + <source linkName="receive-to-approval"> + <transitionCondition> + $request.amount >= 10000 + </transitionCondition> + </source> + </sources> + </receive> + <invoke partnerLink="assessor" + portType="lns:riskAssessmentPT" + operation="check" + inputVariable="request" + outputVariable="risk"> + <targets> + <target linkName="receive-to-assess" /> + </targets> + <sources> + <source linkName="assess-to-setMessage"> + <transitionCondition> + $risk.level='low' + </transitionCondition> + </source> + <source linkName="assess-to-approval"> + <transitionCondition> + $risk.level!='low' + </transitionCondition> + </source> + </sources> + </invoke> + <assign> + <targets> + <target linkName="assess-to-setMessage" /> + </targets> + <sources> + <source linkName="setMessage-to-reply" /> + </sources> + <copy> + <from> + <literal>yes</literal> + </from> + <to variable="approval" part="accept" /> + </copy> + </assign> + <invoke partnerLink="approver" + portType="lns:loanApprovalPT" + operation="approve" + inputVariable="request" + outputVariable="approval"> + <targets> + <target linkName="receive-to-approval" /> + <target linkName="assess-to-approval" /> + </targets> + <sources> + <source linkName="approval-to-reply" /> + </sources> + </invoke> + <reply partnerLink="customer" + portType="lns:loanServicePT" + operation="request" + variable="approval"> + <targets> + <target linkName="setMessage-to-reply" /> + <target linkName="approval-to-reply" /> + </targets> + </reply> + </flow> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,24 @@ +<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@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/> + <partnerLinks> + <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> + </partnerLinks> + <variables> + <variable messageType="sto:buyRequest" name="buyRequestVar"/> + <variable messageType="sto:buyResponse" name="buyResponseVar"/> + </variables> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/> + </sequence> + </scope> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/savara/examples"> + <wsdl:import location="PurchaseGoodsProcess_Buyer.wsdl" namespace="http://www.jboss.org/savara/examples"/> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <plnk:partnerLinkType name="BuyerToStoreLT"> + <plnk:role name="StoreRequester" portType="ns1:StoreInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,26 @@ +<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.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <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_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <partnerLinks> + <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> + </variables> + <sequence> + <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/> + <if> + <sequence> + <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/> + </sequence> + <else> + <sequence> + <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/> + </sequence> + </else> + </if> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditRequest"> + <wsdl:part name="content" type="pur:CreditCheckRequest"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="CreditCheckFailedFault"> + <wsdl:part name="content" type="pur:CreditCheckInvalid"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditResponse"> + <wsdl:part name="content" type="pur:CreditCheckOk"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="CreditAgencyInterface"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="pur:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="pur:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="pur:CreditCheckFailedFault" name="CreditCheckFailed"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="CreditAgencyInterfaceBinding" type="pur:CreditAgencyInterface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="java:org.jboss.savara.examples.purchasing/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="CreditCheckFailed"> + <soap:fault name="CreditCheckFailed" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="CreditAgencyService"> + <wsdl:port binding="pur:CreditAgencyInterfaceBinding" name="CreditAgencyInterfacePort"> + <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyInterfacePort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="java:org.jboss.savara.examples.purchasing"> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <plnk:partnerLinkType name="StoreToCreditAgencyServiceLT"> + <plnk:role name="CreditAgencyInterface" portType="ns1:CreditAgencyInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: 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 (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -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> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Store" targetNamespace="http://www.jboss.org/examples/store"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="BuyFailedFault"> + <wsdl:part name="content" type="sto:BuyFailed"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyRequest"> + <wsdl:part name="content" type="sto:BuyRequest"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyResponse"> + <wsdl:part name="content" type="sto:BuyConfirmed"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="StoreInterface"> + <wsdl:operation name="buy"> + <wsdl:input message="sto:buyRequest"> + </wsdl:input> + <wsdl:output message="sto:buyResponse"> + </wsdl:output> + <wsdl:fault message="sto:BuyFailedFault" name="BuyFailed"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="StoreInterfaceBinding" type="sto:StoreInterface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="buy"> + <soap:operation soapAction="http://www.jboss.org/examples/store/buy"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="BuyFailed"> + <soap:fault name="BuyFailed" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="StoreService"> + <wsdl:port binding="sto:StoreInterfaceBinding" name="StoreInterfacePort"> + <soap:address location="http://localhost:8080/StoreService/StoreInterfacePort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:ns2="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/examples/store"> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <plnk:partnerLinkType name="BuyerToStoreServiceLT"> + <plnk:role name="StoreInterface" portType="ns1:StoreInterface"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="StoreToCreditAgencyLT"> + <plnk:role name="CreditAgencyRequester" portType="ns2:CreditAgencyInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: 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 (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -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> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_BuyerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"> + <wsdl:import location="ReqRespFaultProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/> + <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> + <plnk:partnerLinkType name="BuyerToSellerLT"> + <plnk:role name="SellerRequester" portType="ns1:SellerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: 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 (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -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> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditRequest"> + <wsdl:part element="CreditCheckRequest" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditResponse"> + <wsdl:part element="CreditCheckOk" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="insufficientCreditFault"> + <wsdl:part element="CreditCheckInvalid" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SellerBehavior"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="slr:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="slr:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="slr:insufficientCreditFault" name="insufficientCredit"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SellerBehaviorBinding" type="slr:SellerBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="http://www.pi4soa.org/ReqRespFault/Seller/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="insufficientCredit"> + <soap:fault name="insufficientCredit" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SellerService"> + <wsdl:port binding="slr:SellerBehaviorBinding" name="SellerBehaviorPort"> + <soap:address location="http://localhost:8080/SellerService/SellerBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> + <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> + <plnk:partnerLinkType name="BuyerToSellerServiceLT"> + <plnk:role name="SellerBehavior" portType="ns1:SellerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,15 @@ +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <partnerLinks> + <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/> + </partnerLinks> + <variables> + <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> + <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> + </variables> + <sequence> + <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/> + <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl 2011-01-04 21:53:07 UTC (rev 531) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <wsdl:import location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineServiceLT"> + <plnk:role name="SupplierBehavior" portType="ns1:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions>

13 years, 4 months

1
0
0 / 0

savara SVN: r530 - in branches/experimental/2.0.x: bundles/org.savara.bpel/META-INF and 7 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 12:44:48 -0500 (Tue, 04 Jan 2011) New Revision: 530 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java branches/experimental/2.0.x/distribution/ branches/experimental/2.0.x/docs/gettingstartedguide/ branches/experimental/2.0.x/docs/samplesguide/ branches/experimental/2.0.x/docs/userguide/ Log: Fixed unit tests in BPEL bundle and now does full build. Have to effectively comment out the parser tests, which will need to be moved to the bpel.tests bundle anyway. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-04 17:44:48 UTC (rev 530) @@ -22,3 +22,6 @@ org.savara.bpel.parser, org.savara.bpel.util Bundle-ActivationPolicy: lazy +Bundle-ClassPath: lib/jaxb-api.jar, + lib/jaxb-impl.jar, + . Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties 2011-01-04 17:44:48 UTC (rev 530) @@ -1,4 +1,6 @@ source.. = src/main/java/ output.. = bin/ bin.includes = META-INF/,\ - . + .,\ + lib/jaxb-api.jar,\ + lib/jaxb-impl.jar Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-04 17:44:48 UTC (rev 530) @@ -49,6 +49,16 @@ <artifactId>org.osgi.core</artifactId> <version>${osgi.version}</version> </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.version}</version> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.version}</version> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-04 17:44:48 UTC (rev 530) @@ -189,19 +189,16 @@ } } - /* GPB: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING + /* TODO: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING * POSITIONAL INFO. - * - for (DeclarationBinding db : run.getBindings()) { - if (db.getDeclaration() instanceof Role) { - Contract c=contracts.remove(db.getDeclaration().getName()); - - if (c != null) { - contracts.put(db.getBoundName(), c); - } + */ + for (Parameter p : run.getParameters()) { + Contract c=contracts.remove(p.getName()); + + if (c != null) { + contracts.put(p.getBoundName(), c); } } - */ } } @@ -230,19 +227,16 @@ } } - /* GPB: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING + /* TODO: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING * POSITIONAL INFO. - * - for (DeclarationBinding db : run.getBindings()) { - if (db.getDeclaration() instanceof Role) { - Contract c=contracts.remove(db.getBoundName()); - - if (c != null) { - contracts.put(db.getDeclaration().getName(), c); - } + */ + for (Parameter db : run.getParameters()) { + Contract c=contracts.remove(db.getBoundName()); + + if (c != null) { + contracts.put(db.getName(), c); } } - */ } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-04 17:44:48 UTC (rev 530) @@ -199,6 +199,7 @@ conv.getBlock().getContents().add(rl); Protocol subconv=new Protocol(); + subconv.setName(SUB_PROTOCOL); Role subr1=new Role(); subr1.setName(MY_OTHER_LOCATED_ROLE); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 16:22:30 UTC (rev 529) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-04 17:44:48 UTC (rev 530) @@ -17,7 +17,6 @@ */ package org.savara.bpel.parser; -import java.io.InputStream; import java.net.URI; import org.savara.util.ScribbleServices; @@ -34,6 +33,7 @@ public static TestSuite suite() { TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); + /* suite.addTest(new BPELToConversationTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); suite.addTest(new BPELToConversationTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); suite.addTest(new BPELToConversationTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); @@ -58,7 +58,7 @@ /** * The test case for running the BPEL to Conversation test. */ - public static class BPELToConversationTest extends TestCase { + protected static class BPELToConversationTest extends TestCase { /** * This constructor is initialized with the test Property changes on: branches/experimental/2.0.x/distribution ___________________________________________________________________ Name: svn:ignore + target Property changes on: branches/experimental/2.0.x/docs/gettingstartedguide ___________________________________________________________________ Name: svn:ignore - .settings + .settings target Property changes on: branches/experimental/2.0.x/docs/samplesguide ___________________________________________________________________ Name: svn:ignore - .settings + .settings target Property changes on: branches/experimental/2.0.x/docs/userguide ___________________________________________________________________ Name: svn:ignore + target

13 years, 4 months

1
0
0 / 0

savara SVN: r529 - in branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test: resources/generator/results and 1 other directory.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 11:22:30 -0500 (Tue, 04 Jan 2011) New Revision: 529 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel Log: Fixed remaining BPEL tests. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 13:44:12 UTC (rev 528) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 16:22:30 UTC (rev 529) @@ -38,25 +38,12 @@ public static Test suite() { TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); - - // ISSUES: - // Need to deal with case when top level protocol is not projected, but - // the role to be projected belongs to a nested protocol. What happens - // if two separate nested protocols use the same role name? Possibly - // this needs to be reported as an unhandled case for now. - - //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); - //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); - - + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", - "SupplierQuoteEngine")); - /* - */ - suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer")); suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "CreditAgency")); suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Store")); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-04 13:44:12 UTC (rev 528) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-04 16:22:30 UTC (rev 529) @@ -1,36 +1,29 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> - </variables> - <sequence> - <pick> - <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar"> - <sequence> - <scope> - <sequence> - <if> - <sequence> - <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/> - </sequence> - <else> - <sequence> - <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/> - </sequence> - </else> - </if> - </sequence> - </scope> - </sequence> - </onMessage> - </pick> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" myRole="CreditAgency"/> + </partnerLinks> + <variables> + <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/> + <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/> + <variable name="invalidCreditFaultVar" messageType="cay:invalidCreditFault"/> + </variables> + <sequence> + <receive partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/> + <if> + <sequence> + <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/> + </sequence> + <else> + <sequence> + <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="invalidCreditFaultVar" faultName="cay:invalidCredit" name="Send_CreditCheckInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-04 13:44:12 UTC (rev 528) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-04 16:22:30 UTC (rev 529) @@ -1,20 +1,16 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <partnerLinks> - <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> - <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> - </variables> - <sequence> - <pick createInstance="yes"> - <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar"> - <sequence> - <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/> - </sequence> - </onMessage> - </pick> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" myRole="SupplierTxnProcessor"/> + </partnerLinks> + <variables> + <variable name="confirmRequestVar" messageType="spr:confirmRequest"/> + <variable name="confirmResponseVar" messageType="spr:confirmResponse"/> + </variables> + <sequence> + <receive partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmRequestVar" createInstance="yes" name="Receive_orderConfirmed"/> + <reply partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmResponseVar" name="Send_bookingReference"/> + </sequence> +</process>

13 years, 4 months

1
0
0 / 0

savara SVN: r528 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/resources/generator/results and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 08:44:12 -0500 (Tue, 04 Jan 2011) New Revision: 528 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java Log: Updated cdm to protocol parser, to ensure that roles are not reused in interactions, as this resets the parent link. We need to use their declared location to determine the projection scope. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 11:55:42 UTC (rev 527) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 13:44:12 UTC (rev 528) @@ -52,9 +52,9 @@ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); - /* suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); + /* */ suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer")); @@ -63,7 +63,7 @@ suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller")); - + return suite; } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-04 11:55:42 UTC (rev 527) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-04 13:44:12 UTC (rev 528) @@ -1,15 +1,16 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <partnerLinks> - <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/> - </partnerLinks> - <variables> - <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> - <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> - </variables> - <sequence> - <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/> - <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/> - </sequence> -</process> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngine.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" myRole="SupplierBehavior"/> + </partnerLinks> + <variables> + <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/> + <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/> + </variables> + <sequence> + <receive partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteRequestVar" createInstance="yes" name="Receive_requestForQuote"/> + <reply partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteResponseVar" name="Send_quote"/> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-04 11:55:42 UTC (rev 527) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-04 13:44:12 UTC (rev 528) @@ -186,10 +186,10 @@ getWhens().addAll(blocks); ((org.scribble.protocol.model.Choice)ret). - setFromRole(fromRole); + setFromRole(new Role(fromRole)); if (toRoles.size() == 1) { - ((org.scribble.protocol.model.Choice)ret).setToRole(toRoles.get(0)); + ((org.scribble.protocol.model.Choice)ret).setToRole(new Role(toRoles.get(0))); } else if (toRoles.size() == 0) { // TODO: Report no to roles } else { Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-04 11:55:42 UTC (rev 527) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-04 13:44:12 UTC (rev 528) @@ -90,11 +90,11 @@ block.setMessageSignature(ms); - ret.setFromRole(InteractionConverterRuleImpl.getFromRole(context, - ed)); + ret.setFromRole(new Role(InteractionConverterRuleImpl.getFromRole(context, + ed))); - ret.setFromRole(InteractionConverterRuleImpl.getToRole(context, - ed)); + ret.setToRole(new Role(InteractionConverterRuleImpl.getToRole(context, + ed))); } } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-04 11:55:42 UTC (rev 527) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-04 13:44:12 UTC (rev 528) @@ -351,8 +351,8 @@ getInterfaceName(cdl)); } - interaction.setFromRole(getFromRole(context, details)); - interaction.getToRoles().add(getToRole(context, details)); + interaction.setFromRole(new Role(getFromRole(context, details))); + interaction.getToRoles().add(new Role(getToRole(context, details))); if (details.getAction() == ExchangeActionType.REQUEST) {

13 years, 4 months

1
0
0 / 0

savara SVN: r527 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/generator and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-04 06:55:42 -0500 (Tue, 04 Jan 2011) New Revision: 527 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java Log: Fixed additional invoke in the first choice path. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-04 11:55:42 UTC (rev 527) @@ -131,6 +131,20 @@ TScope scope=(TScope)context.getProperties().get(BPELDefinitions.BPEL_SCOPE_PROPERTY); if (scope == null) { + TSequence newseq = new TSequence(); + + // Move invoke + java.util.List<Object> acts= + ((TSequence)context.getParent()).getActivity(); + + if (acts.size() > 0 && + acts.get(acts.size()-1) instanceof TInvoke) { + TInvoke invoke=(TInvoke)acts.get(acts.size()-1); + acts.remove(invoke); + newseq.getActivity().add(invoke); + } + + // Create scope and fault handler scope = new TScope(); scope.setFaultHandlers(new TFaultHandlers()); @@ -138,7 +152,7 @@ seq.getActivity().add(scope); - seq = new TSequence(); + seq = newseq; scope.setSequence(seq); @@ -159,7 +173,7 @@ String faultName=InteractionPatterns.getFaultName(path); Contract fromContract = ModelChangeUtils.getContract(context, - elem.getFromRole()); + (elem.getFromRole()==null?role:elem.getFromRole())); // Define fault message type QName qname= WSDLGeneratorUtil.getFaultMessageType(fromContract.getNamespace(), Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-04 11:55:42 UTC (rev 527) @@ -102,8 +102,35 @@ // to use for subsequent activities. public static boolean isResponseAndFaultHandler(Choice choice) { - boolean ret=false; + boolean ret=choice.getWhens().size() > 0; + // Check if all paths are responses with same reply label + String label=null; + + for (int i=0; ret && i < choice.getWhens().size(); i++) { + When path=choice.getWhens().get(i); + + if (i == 0) { + label = getReplyToLabel(path); + + if (label == null || InteractionUtil.isRequest(path) + || InteractionUtil.isSend(path)) { + ret = false; + } + } else { + String replyTo=getReplyToLabel(path); + + if (replyTo == null || + replyTo.equals(label) == false || + InteractionUtil.isRequest(path) || + InteractionUtil.isSend(path)) { + ret = false; + } + } + } + + /* + // Obtain interaction prior to 'If' if (choice.getPaths().size() > 0 && choice.getParent() instanceof @@ -136,17 +163,6 @@ getReplyToLabel(when).equals(requestLabel)) { matched++; } - /* - if (paths.get(i).getBlock().getContents().size() > 0) { - Interaction in=getPickPathInteraction(paths.get(i).getBlock()); - - if (in != null && - InteractionUtil.isResponse(in) && - getReplyToLabel(in).equals(requestLabel)) { - matched++; - } - } - */ } if (matched == paths.size()) { @@ -155,6 +171,7 @@ } } } + */ return(ret); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 11:55:42 UTC (rev 527) @@ -38,19 +38,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); - /* - * TWO ISSUES: - * - * 1) Additional invoke being generated in first choice path, which - * appears to be related to the 'when' message signature - the problem - * being that the second instance of the invoke is created from the - * interaction inside the run sub-protocol. - * - * 2) Additional 'myRole' on partnerlink - seems to be related to - * Broker rather tha Buyer which would have expected. - * suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); - */ // ISSUES: // Need to deal with case when top level protocol is not projected, but @@ -58,8 +46,10 @@ // if two separate nested protocols use the same role name? Possibly // this needs to be reported as an unhandled case for now. - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); + //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); + + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); /* Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-04 11:55:42 UTC (rev 527) @@ -15,13 +15,13 @@ <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/> <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/> <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/> - <variable name="buyRequestVar" messageType="brk:buyRequest"/> <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/> <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/> <variable name="confirmRequestVar" messageType="spr:confirmRequest"/> <variable name="confirmResponseVar" messageType="spr:confirmResponse"/> <variable name="buyResponseVar" messageType="brk:buyResponse"/> <variable name="rejectedFaultVar" messageType="brk:rejectedFault"/> + <variable name="buyRequestVar" messageType="brk:buyRequest"/> <variable name="cancelRequestVar" messageType="brk:cancelRequest"/> </variables> <sequence> @@ -40,21 +40,17 @@ <onMessage partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyRequestVar"> <sequence> <scope> - <sequence> - <scope> -<faultHandlers> - <catch faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar" faultMessageType="cay:invalidCreditFault"> - <sequence> - <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="rejectedFaultVar" faultName="brk:rejected" name="Send_orderRejected"/> - </sequence> - </catch> -</faultHandlers> + <faultHandlers> + <catch faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar" faultMessageType="cay:invalidCreditFault"> <sequence> - <invoke partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/> - <invoke partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" inputVariable="confirmRequestVar" outputVariable="confirmResponseVar" name="Send_orderConfirmed"/> - <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyResponseVar" name="Send_bookingReference"/> + <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="rejectedFaultVar" faultName="brk:rejected" name="Send_orderRejected"/> </sequence> - </scope> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/> + <invoke partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" inputVariable="confirmRequestVar" outputVariable="confirmResponseVar" name="Send_orderConfirmed"/> + <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyResponseVar" name="Send_bookingReference"/> </sequence> </scope> </sequence> Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-04 11:55:42 UTC (rev 527) @@ -1,43 +1,39 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> - <partnerLinks> - <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> - </partnerLinks> - <variables> - <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> - <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> - <variable messageType="brk:buyRequest" name="buyRequestVar"/> - <variable messageType="brk:buyResponse" name="buyResponseVar"/> - <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> - </variables> - <sequence> - <invoke inputVariable="makeEnquiryRequestVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - <receive name="Receive_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/> - <if> - <sequence> - <scope> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke inputVariable="buyRequestVar" name="Send_buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - </sequence> - </scope> - </sequence> - </scope> - </sequence> - <else> - <sequence> - <invoke inputVariable="cancelRequestVar" name="Send_cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/> - </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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> + <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.pi4soa.org/ESBBroker/Buyer" location="ESBBrokerProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> + </partnerLinks> + <variables> + <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/> + <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/> + <variable name="buyRequestVar" messageType="byr:buyRequest"/> + <variable name="buyResponseVar" messageType="brk:buyResponse"/> + <variable name="cancelRequestVar" messageType="byr:cancelRequest"/> + </variables> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" inputVariable="makeEnquiryRequestVar" outputVariable="makeEnquiryResponseVar" name="Send_enquiry"/> + <if> + <sequence> + <scope> + <faultHandlers> + <catch faultName="brk:rejected" faultVariable="rejectedFaultVar" faultMessageType="brk:rejectedFault"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_buy"/> + </sequence> + </scope> + </sequence> + <else> + <sequence> + <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="cancel" inputVariable="cancelRequestVar" name="Send_cancel"/> + </sequence> + </else> + </if> + </sequence> +</process> Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java 2011-01-04 11:55:42 UTC (rev 527) @@ -19,6 +19,7 @@ */ package org.savara.pi4soa.cdm.parser.rules; +import org.pi4soa.cdl.Choreography; import org.pi4soa.cdl.ExchangeDetails; import org.scribble.protocol.model.*; @@ -129,4 +130,16 @@ */ public boolean shouldIgnore(ExchangeDetails ed); + /** + * This method determines whether the supplied choreography + * is associated with exchange details to be ignored. If + * so, then the choreography should be expanded, and the + * relevant exchange details ignored. + * + * @param choreo The choreography to check + * @return Whether the choreography has an ignored exchange details, + * and should therefore be expanded + */ + public boolean shouldExpandChoreography(Choreography choreo); + } Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java 2011-01-04 11:55:42 UTC (rev 527) @@ -21,6 +21,7 @@ import java.util.logging.Logger; +import org.pi4soa.cdl.Choreography; import org.pi4soa.cdl.ExchangeDetails; import org.scribble.protocol.model.*; @@ -201,6 +202,29 @@ return(m_ignore.contains(ed)); } + /** + * This method determines whether the supplied choreography + * is associated with exchange details to be ignored. If + * so, then the choreography should be expanded, and the + * relevant exchange details ignored. + * + * @param choreo The choreography to check + * @return Whether the choreography has an ignored exchange details, + * and should therefore be expanded + */ + public boolean shouldExpandChoreography(Choreography choreo) { + boolean ret=false; + + for (ExchangeDetails ed : m_ignore) { + if (ed.getEnclosingChoreography() == choreo) { + ret = true; + break; + } + } + + return(ret); + } + private static Logger logger = Logger.getLogger(DefaultConverterContext.class.getName()); //private ModelReference m_source=null; Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-04 11:55:42 UTC (rev 527) @@ -53,72 +53,65 @@ */ public ModelObject convert(ConverterContext context, Class<?> scribbleType, CDLType cdlType) { - org.scribble.protocol.model.Run ret=new org.scribble.protocol.model.Run(); org.pi4soa.cdl.Perform cdl=(org.pi4soa.cdl.Perform)cdlType; + ModelObject ret=null; - if (cdl.getWaitForCompletion() != Boolean.TRUE) { - // TODO: Need to consider how to deal with async perform - // possibly when split is supported - } + // Check if context contains an interaction from the performed choreography + // that is to be ignored - this would indicate that the perform is contained + // within a choice + if (context.shouldExpandChoreography(cdl.getChoreography())) { + ret = new Block(); + + context.pushScope(); + + // Define roles + ProtocolConverterRuleImpl.defineRoles(context, cdl.getChoreography(), (Block)ret); + + ProtocolConverterRuleImpl.convertActivities(context, cdl.getChoreography().getActivities(), (Block)ret); - ret.getProperties().put("CDLType", - CDLTypeUtil.getURIFragment(cdl)); - - ProtocolReference ref=new ProtocolReference(); - ref.setName(cdl.getChoreography().getName()); - ref.setInner(true); - - ret.setProtocolReference(ref); - - // Find conversation related to reference, and use - // as inner definition initially - to help with - // subsequent processing (e.g. locating initiator - // roles). The inner definition will be cleared when - // the model is fully converted. - - /* TODO: Is this required for Scribble v2 - Protocol conv=context.getProtocol(ref); - - if (conv != null) { - ret.setInlineDefinition(conv); - context.getComposeActivities().add(ret); - - // Bind roles - java.util.List<Role> roles=conv.getRoles(); + context.popScope(); - for (int i=0; i < roles.size(); i++) { - Role role=roles.get(i); - - Object decl=context.getState(role.getName()); - - if (decl instanceof Role) { - ret.getBindings().add(new DeclarationBinding(((Role)decl).getName(), role.getName())); - } + } else { + org.scribble.protocol.model.Run run=new org.scribble.protocol.model.Run(); + + if (cdl.getWaitForCompletion() != Boolean.TRUE) { + // TODO: Need to consider how to deal with async perform + // possibly when split is supported } - } - */ - - // Convert binding parameters - java.util.List<BindDetails> bds=cdl.getBindDetails(); - - for (int i=0; i < bds.size(); i++) { - // Only convert if a variable, not a channel - // TODO: Need to also convert explicit channels - if (bds.get(i).getThisVariable() instanceof org.pi4soa.cdl.Variable) { - Parameter db=new Parameter(); + run.getProperties().put("CDLType", + CDLTypeUtil.getURIFragment(cdl)); + + ProtocolReference ref=new ProtocolReference(); + ref.setName(cdl.getChoreography().getName()); + ref.setInner(true); + + run.setProtocolReference(ref); + + // Convert binding parameters + java.util.List<BindDetails> bds=cdl.getBindDetails(); + + for (int i=0; i < bds.size(); i++) { - Object state=context.getState(bds.get(i).getThisVariable().getName()); - - if (state instanceof Role) { - db.setName(((Role)state).getName()); - db.setBoundName(bds.get(i).getFreeVariable().getName()); - - ret.getParameters().add(db); - } else { - logger.finer("State not found for '"+bds.get(i).getThisVariable().getName()+"'"); + // Only convert if a variable, not a channel + // TODO: Need to also convert explicit channels + if (bds.get(i).getThisVariable() instanceof org.pi4soa.cdl.Variable) { + Parameter db=new Parameter(); + + Object state=context.getState(bds.get(i).getThisVariable().getName()); + + if (state instanceof Role) { + db.setName(((Role)state).getName()); + db.setBoundName(bds.get(i).getFreeVariable().getName()); + + run.getParameters().add(db); + } else { + logger.finer("State not found for '"+bds.get(i).getThisVariable().getName()+"'"); + } } } + + ret = run; } return(ret); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-03 00:14:10 UTC (rev 526) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-04 11:55:42 UTC (rev 527) @@ -80,7 +80,7 @@ ret.setName(choreo.getName()); // Define roles - defineRoles(context, choreo, ret); + defineRoles(context, choreo, ret.getBlock()); // Check if root, then need to project other sibling choreos if (choreo.getRoot() == Boolean.TRUE) { @@ -249,8 +249,8 @@ } - protected void defineRoles(ConverterContext context, - final Choreography choreo, Protocol conv) { + protected static void defineRoles(ConverterContext context, + final Choreography choreo, Block block) { org.pi4soa.cdl.interfaces.InterfaceDeriver intfDeriver= org.pi4soa.cdl.interfaces.InterfaceFactory.getInterfaceDeriver(); @@ -310,7 +310,7 @@ if (roleList == null) { roleList = new RoleList(); - conv.getBlock().getContents().add(roleList); + block.getContents().add(roleList); } roleList.getRoles().add(role); @@ -389,7 +389,7 @@ //roleList.setOpen(choreo.getRoot() != Boolean.TRUE); - conv.getBlock().getContents().add(roleList); + block.getContents().add(roleList); } roleList.getRoles().add(role); @@ -439,7 +439,7 @@ } } - protected void setupInterfaces(org.pi4soa.cdl.RoleType roleType, Contract contract, + protected static void setupInterfaces(org.pi4soa.cdl.RoleType roleType, Contract contract, org.pi4soa.cdl.interfaces.InterfaceDeriver intfDeriver) { org.pi4soa.cdl.interfaces.RoleTypeDefinition rtd= @@ -510,7 +510,7 @@ } */ - protected void convertActivities(ConverterContext context, + protected static void convertActivities(ConverterContext context, java.util.List<org.pi4soa.cdl.Activity> acts, Block block) { java.util.Iterator<org.pi4soa.cdl.Activity> actiter=

13 years, 4 months

1
0
0 / 0

Build failed in Hudson: jbosstools-savara-1.2_trunk #211

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/211/> ------------------------------------------ [...truncated 151 lines...] at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getRepositoryUUID(DAVRepository.java:146) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:342) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:330) at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:535) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:699) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting6929716800150946161/svnkit.build.properties (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.<init>(FileOutputStream.java:179) at java.io.FileOutputStream.<init>(FileOutputStream.java:131) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:266) at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:194) ... 31 more Retrying after 10 seconds Updating http://anonsvn.jboss.org/repos/savara/trunk hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/> at hudson.remoting.Channel@3b255a4a:dev17-rhel4-x86_64 at hudson.FilePath.act(FilePath.java:751) at hudson.FilePath.act(FilePath.java:735) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:653) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:601) at hudson.model.AbstractProject.checkout(AbstractProject.java:1040) at hudson.model.AbstractBuild$AbstractRunner.checkout(AbstractBuild.java:479) at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:411) at hudson.model.Run.run(Run.java:1257) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:129) Caused by: java.io.IOException: Remote call on dev17-rhel4-x86_64 failed at hudson.remoting.Channel.call(Channel.java:564) at hudson.FilePath.act(FilePath.java:742) ... 10 more Caused by: java.lang.Error: Unable to load resource svnkit.build.properties at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:198) at java.lang.ClassLoader.getResource(ClassLoader.java:1003) at java.lang.ClassLoader.getResourceAsStream(ClassLoader.java:1193) at java.lang.Class.getResourceAsStream(Class.java:2030) at org.tmatesoft.svn.util.Version.loadProperties(Version.java:116) at org.tmatesoft.svn.util.Version.getVersionString(Version.java:48) at org.tmatesoft.svn.util.Version.getUserAgent(Version.java:60) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.composeHTTPHeader(HTTPRequest.java:340) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.dispatch(HTTPRequest.java:165) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:345) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getRepositoryUUID(DAVRepository.java:146) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:342) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:330) at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:535) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:699) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting5241070417733397730/svnkit.build.properties (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.<init>(FileOutputStream.java:179) at java.io.FileOutputStream.<init>(FileOutputStream.java:131) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:266) at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:194) ... 31 more Retrying after 10 seconds Updating http://anonsvn.jboss.org/repos/savara/trunk hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/> at hudson.remoting.Channel@3b255a4a:dev17-rhel4-x86_64 at hudson.FilePath.act(FilePath.java:751) at hudson.FilePath.act(FilePath.java:735) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:653) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:601) at hudson.model.AbstractProject.checkout(AbstractProject.java:1040) at hudson.model.AbstractBuild$AbstractRunner.checkout(AbstractBuild.java:479) at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:411) at hudson.model.Run.run(Run.java:1257) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:129) Caused by: java.io.IOException: Remote call on dev17-rhel4-x86_64 failed at hudson.remoting.Channel.call(Channel.java:564) at hudson.FilePath.act(FilePath.java:742) ... 10 more Caused by: java.lang.Error: Unable to load resource svnkit.build.properties at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:198) at java.lang.ClassLoader.getResource(ClassLoader.java:1003) at java.lang.ClassLoader.getResourceAsStream(ClassLoader.java:1193) at java.lang.Class.getResourceAsStream(Class.java:2030) at org.tmatesoft.svn.util.Version.loadProperties(Version.java:116) at org.tmatesoft.svn.util.Version.getVersionString(Version.java:48) at org.tmatesoft.svn.util.Version.getUserAgent(Version.java:60) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.composeHTTPHeader(HTTPRequest.java:340) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.dispatch(HTTPRequest.java:165) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:345) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getRepositoryUUID(DAVRepository.java:146) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:342) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:330) at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:535) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:699) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting8484647123297356955/svnkit.build.properties (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.<init>(FileOutputStream.java:179) at java.io.FileOutputStream.<init>(FileOutputStream.java:131) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:266) at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:194) ... 31 more Retrying after 10 seconds Updating http://anonsvn.jboss.org/repos/savara/trunk hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/> at hudson.remoting.Channel@3b255a4a:dev17-rhel4-x86_64 at hudson.FilePath.act(FilePath.java:751) at hudson.FilePath.act(FilePath.java:735) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:653) at hudson.scm.SubversionSCM.checkout(SubversionSCM.java:601) at hudson.model.AbstractProject.checkout(AbstractProject.java:1040) at hudson.model.AbstractBuild$AbstractRunner.checkout(AbstractBuild.java:479) at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:411) at hudson.model.Run.run(Run.java:1257) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:129) Caused by: java.io.IOException: Remote call on dev17-rhel4-x86_64 failed at hudson.remoting.Channel.call(Channel.java:564) at hudson.FilePath.act(FilePath.java:742) ... 10 more Caused by: java.lang.Error: Unable to load resource svnkit.build.properties at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:198) at java.lang.ClassLoader.getResource(ClassLoader.java:1003) at java.lang.ClassLoader.getResourceAsStream(ClassLoader.java:1193) at java.lang.Class.getResourceAsStream(Class.java:2030) at org.tmatesoft.svn.util.Version.loadProperties(Version.java:116) at org.tmatesoft.svn.util.Version.getVersionString(Version.java:48) at org.tmatesoft.svn.util.Version.getUserAgent(Version.java:60) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.composeHTTPHeader(HTTPRequest.java:340) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPRequest.dispatch(HTTPRequest.java:165) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:345) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:273) at org.tmatesoft.svn.core.internal.io.dav.http.HTTPConnection.request(HTTPConnection.java:261) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.exchangeCapabilities(DAVConnection.java:516) at org.tmatesoft.svn.core.internal.io.dav.DAVConnection.open(DAVConnection.java:98) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.openConnection(DAVRepository.java:1001) at org.tmatesoft.svn.core.internal.io.dav.DAVRepository.getRepositoryUUID(DAVRepository.java:146) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:342) at org.tmatesoft.svn.core.wc.SVNBasicClient.createRepository(SVNBasicClient.java:330) at org.tmatesoft.svn.core.wc.SVNUpdateClient.update(SVNUpdateClient.java:535) at org.tmatesoft.svn.core.wc.SVNUpdateClient.doUpdate(SVNUpdateClient.java:401) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:699) at hudson.scm.SubversionSCM$CheckOutTask.invoke(SubversionSCM.java:660) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting4995081087629571635/svnkit.build.properties (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.<init>(FileOutputStream.java:179) at java.io.FileOutputStream.<init>(FileOutputStream.java:131) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:266) at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:194) ... 31 more Archiving artifacts Recording test results ERROR: Failed to archive test reports hudson.util.IOException2: remote file operation failed: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/> at hudson.remoting.Channel@3b255a4a:dev17-rhel4-x86_64 at hudson.FilePath.act(FilePath.java:751) at hudson.FilePath.act(FilePath.java:735) at hudson.tasks.junit.JUnitParser.parse(JUnitParser.java:83) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:122) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:133) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:19) at hudson.model.AbstractBuild$AbstractRunner.perform(AbstractBuild.java:601) at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:580) at hudson.model.AbstractBuild$AbstractRunner.performAllBuildSteps(AbstractBuild.java:558) at hudson.model.Build$RunnerImpl.post2(Build.java:158) at hudson.model.AbstractBuild$AbstractRunner.post(AbstractBuild.java:528) at hudson.model.Run.run(Run.java:1280) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:129) Caused by: java.io.IOException: Remote call on dev17-rhel4-x86_64 failed at hudson.remoting.Channel.call(Channel.java:564) at hudson.FilePath.act(FilePath.java:742) ... 14 more Caused by: java.lang.Error: Unable to load resource hudson/tasks/junit/Messages.properties at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:198) at java.lang.ClassLoader.getResource(ClassLoader.java:1003) at java.lang.Class.getResource(Class.java:2074) at org.jvnet.localizer.ResourceBundleHolder.get(ResourceBundleHolder.java:83) at org.jvnet.localizer.ResourceBundleHolder.get(ResourceBundleHolder.java:102) at org.jvnet.localizer.ResourceBundleHolder.get(ResourceBundleHolder.java:102) at org.jvnet.localizer.ResourceBundleHolder.format(ResourceBundleHolder.java:139) at hudson.tasks.junit.Messages.JUnitResultArchiver_NoTestReportFound(Messages.java:229) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:111) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:87) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:1901) at hudson.remoting.UserRequest.perform(UserRequest.java:114) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:270) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303) at java.util.concurrent.FutureTask.run(FutureTask.java:138) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) Caused by: java.io.FileNotFoundException: /tmp/hudson-remoting2259454761661023041/hudson/tasks/junit/Messages.properties (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.<init>(FileOutputStream.java:179) at java.io.FileOutputStream.<init>(FileOutputStream.java:131) at hudson.remoting.RemoteClassLoader.makeResource(RemoteClassLoader.java:266) at hudson.remoting.RemoteClassLoader.findResource(RemoteClassLoader.java:194) ... 19 more

13 years, 4 months

1
1
0 / 0

savara SVN: r526 - branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-02 19:14:10 -0500 (Sun, 02 Jan 2011) New Revision: 526 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java Log: Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-02 21:10:02 UTC (rev 525) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-03 00:14:10 UTC (rev 526) @@ -38,14 +38,32 @@ public static Test suite() { TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); + /* + * TWO ISSUES: + * + * 1) Additional invoke being generated in first choice path, which + * appears to be related to the 'when' message signature - the problem + * being that the second instance of the invoke is created from the + * interaction inside the run sub-protocol. + * + * 2) Additional 'myRole' on partnerlink - seems to be related to + * Broker rather tha Buyer which would have expected. + * suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); + */ + + // ISSUES: + // Need to deal with case when top level protocol is not projected, but + // the role to be projected belongs to a nested protocol. What happens + // if two separate nested protocols use the same role name? Possibly + // this needs to be reported as an unhandled case for now. + + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); + //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); /* - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", - "SupplierTxnProcessor")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); */ @@ -131,7 +149,7 @@ org.scribble.protocol.model.Role role=null; // Obtain role from definition - Protocol defn=model.getProtocol(); + //Protocol defn=model.getProtocol(); // Check if subpath definition defined /* @@ -140,7 +158,7 @@ } */ - java.util.List<org.scribble.protocol.model.Role> roles=defn.getRoles(); + java.util.List<org.scribble.protocol.model.Role> roles=model.getRoles(); //new org.scribble.model.Role(m_role); for (int i=0; role == null && i < roles.size(); i++) {

13 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits January 2011