November 2009 - savara-commits - Jboss List Archives

savara SVN: r86 - tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results.

by do-not-reply＠jboss.org

Author: objectiser Date: 2009-11-15 08:05:24 -0500 (Sun, 15 Nov 2009) New Revision: 86 Removed: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected Log: Remove unwanted test file. Deleted: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected 2009-11-15 13:03:58 UTC (rev 85) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected 2009-11-15 13:05:24 UTC (rev 86) @@ -1,10 +0,0 @@ -namespace null; - -conversation ReqRespFaultProcess_Seller@Seller implements ReqRespFaultProcess@Seller { - checkCredit(CreditCheckRequest) from Buyer to Seller; - if { - checkCredit(CreditCheckOk) from Seller to Buyer; - } else if { - checkCredit(CreditCheckInvalid) from Seller to Buyer; - } -} \ No newline at end of file

16 years, 5 months

1
0
0 / 0

savara SVN: r85 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: plugintest/org/jboss/savara/tools/bpel/generator/results and 4 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2009-11-15 08:03:58 -0500 (Sun, 15 Nov 2009) New Revision: 85 Added: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Buyer.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)CreditAgency.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierQuoteEngine.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierTxnProcessor.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Buyer.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Store.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Buyer.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.scv tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Broker.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)CreditAgency.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierQuoteEngine.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierTxnProcessor.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Store.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Seller.bpel Log: Final updates to WSDL/BPEL and fixing the plugin tests. Still issue with fault handling to be resolved when deploying to RiftSaw. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-11-15 13:03:58 UTC (rev 85) @@ -272,12 +272,20 @@ java.util.List<javax.wsdl.Definition> defns=generator.generateDefinitions(contract, new SOAPRPCWSDLBinding()); + // Check if contract has atleast one message exchange pattern + boolean f_hasMEP=false; + + for (int i=0; f_hasMEP == false && i < contract.getInterfaces().size(); i++) { + Interface intf=contract.getInterfaces().get(i); + f_hasMEP = (intf.getMessageExchangePatterns().size() > 0); + } + for (int i=defns.size()-1; i >= 0; i--) { javax.wsdl.Definition defn=defns.get(i); // Check if definition has a port type if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0 - || defn.getServices().size() > 0) { + || (f_hasMEP && defn.getServices().size() > 0)) { String filename=getWSDLFileName(role, localcm.getModelName().getName(), i); if (i > 0) { Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,23 +1,23 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> +<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="BuyerPartnerLinkTypes.wsdl" namespace="http://www.jboss.org/savara/examples"/> <partnerLinks> <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> </partnerLinks> <variables> - <variable messageType="BuyRequest" name="buyRequestVar"/> - <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> + <variable messageType="sto:BuyRequest" name="buyRequestVar"/> + <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/> </variables> <sequence> <scope> <faultHandlers> - <catch faultMessageType="BuyFailed" faultName="BuyFailed" faultVariable="buyFailedVar"> + <catch faultMessageType="sto:BuyFailed" faultName="sto:BuyFailed" faultVariable="buyFailedVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="tns:StoreBehavior"/> + <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,24 +1,24 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> +<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="CreditAgencyPartnerLinkTypes.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyServiceLT"/> + <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/> </partnerLinks> <variables> - <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> - <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> + <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/> + <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/> + <variable messageType="pur:CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> - <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"/> + <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="tns:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/> + <reply faultName="pur:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckInvalidVar"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,31 +1,31 @@ -<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.pi4soa.org/purchase" 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.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> - <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> +<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="StorePartnerLinkTypes.wsdl" namespace="http://www.jboss.org/examples/store"/> <partnerLinks> - <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="tns:BuyerToStoreServiceLT"/> - <partnerLink name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> </partnerLinks> <variables> - <variable messageType="BuyRequest" name="buyRequestVar"/> - <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> - <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="BuyFailed" name="buyFailedVar"/> + <variable messageType="sto:BuyRequest" name="buyRequestVar"/> + <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/> + <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/> + <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/> + <variable messageType="sto:BuyFailed" name="buyFailedVar"/> </variables> <sequence> - <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyRequestVar"/> + <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/> <scope> <faultHandlers> - <catch faultMessageType="CreditCheckInvalid" faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="pur:CreditCheckInvalid" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="tns:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyFailedVar"/> + <reply faultName="sto:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyFailedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior"/> - <reply operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyConfirmedVar"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/> + <reply operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyConfirmedVar"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm 2009-11-15 13:03:58 UTC (rev 85) @@ -1,79 +1,80 @@ -<?xml version="1.0" encoding="Cp1252"?> -<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.pi4soa.org/purchase"> - <typeDefinitions> - <nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.pi4soa.org/purchase"/> - <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> - <nameSpaces prefix="pur" uRI="java:com.acme.purchasing"/> - <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" elementName="BuyConfirmed"/> - <informationTypes description="This is the information type BuyFailed" name="BuyFailed" elementName="BuyFailed"/> - <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="" elementName="BuyRequest"/> - <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" elementName="CreditCheckInvalid"/> - <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" elementName="CreditCheckOk"/> - <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" elementName="CreditCheckRequest"/> - <informationTypes description="This is the information type IDType" name="IDType" typeName="xsd:string"/> - <informationTypes description="This is the information type URITokenType" name="URITokenType" typeName="xsd:anyURI"/> - <tokens description="This is the token ID" name="ID" informationType="//@typeDefinitions/(a)informationTypes.6"/> - <tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/(a)informationTypes.7"/> - <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.1" query="//@id" name="BuyFailedIDLocator"/> - <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//@id" name="BuyRequestIDLocator"/> - <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.0" query="//@id" name="BuyResponseIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//@id" name="CreditCheckInvalidIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@id" name="CreditCheckRequestIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.4" query="//@id" name="CreditCheckResponseIDLocator"/> - <roleTypes description="This is the role type Buyer" name="Buyer"> - <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/> - </roleTypes> - <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> - <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/> - </roleTypes> - <roleTypes description="This is the role type Store" name="Store"> - <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior"/> - </roleTypes> - <relationshipTypes description="Relationship between Buyer and Store" name="BuyerToStoreRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/> - <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/> - <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.0"> - <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Buyer" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.1"> - <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/(a)roleTypes.2"> - <semanticAnnotations annotation="overlord.cdl.samples.Purchasing@Store" name="conversationType"/> - </participantTypes> - <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.1"> - <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/> - </channelTypes> - <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.2"> - <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/> - </channelTypes> - </typeDefinitions> - <choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true"> - <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.0"/> - <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.1"/> - <variableDefinitions description="This is the variable buy" name="buy" type="//@typeDefinitions/(a)informationTypes.2"/> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/(a)informationTypes.5"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Choice" description="Is credit ok?"> - <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Valid"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyConfirmed" name="BuyConfirmedRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/> - </activities> - </activities> - <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Invalid"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.3" action="Respond" faultName="CreditCheckFailed"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.1" action="Respond" faultName="BuyFailed"/> - </activities> - </activities> - </activities> - </choreographies> -</org.pi4soa.cdl:Package> +<?xml version="1.0" encoding="UTF-8"?> +<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.jboss.org/savara/examples"> + <typeDefinitions> + <nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.jboss.org/savara/examples"/> + <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> + <nameSpaces prefix="pur" uRI="java:org.jboss.savara.examples.purchasing"/> + <nameSpaces prefix="sto" uRI="http://www.jboss.org/examples/store"/> + <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" typeName="sto:BuyConfirmed" elementName=""/> + <informationTypes description="This is the information type BuyFailed" name="BuyFailed" typeName="sto:BuyFailed" elementName=""/> + <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="sto:BuyRequest" elementName=""/> + <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" typeName="pur:CreditCheckInvalid" elementName=""/> + <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" typeName="pur:CreditCheckOk" elementName=""/> + <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" typeName="pur:CreditCheckRequest" elementName=""/> + <informationTypes description="This is the information type IDType" name="IDType" typeName="xsd:string"/> + <informationTypes description="This is the information type URITokenType" name="URITokenType" typeName="xsd:anyURI"/> + <tokens description="This is the token ID" name="ID" informationType="//@typeDefinitions/(a)informationTypes.6"/> + <tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/(a)informationTypes.7"/> + <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.1" query="//@id" name="BuyFailedIDLocator"/> + <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//@id" name="BuyRequestIDLocator"/> + <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.0" query="//@id" name="BuyResponseIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//@id" name="CreditCheckInvalidIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//@id" name="CreditCheckRequestIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.4" query="//@id" name="CreditCheckResponseIDLocator"/> + <roleTypes description="This is the role type Buyer" name="Buyer"> + <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/> + </roleTypes> + <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> + <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior" interface="pur:CreditAgencyInterface"/> + </roleTypes> + <roleTypes description="This is the role type Store" name="Store"> + <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior" interface="sto:StoreInterface"/> + </roleTypes> + <relationshipTypes description="Relationship between Buyer and Store" name="BuyerToStoreRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/> + <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.2" secondRoleType="//@typeDefinitions/(a)roleTypes.1"/> + <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.0"> + <semanticAnnotations annotation="savara.samples.Purchasing@Buyer" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type pur:CreditAgency" name="pur:CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.1"> + <semanticAnnotations annotation="savara.samples.Common@CreditAgency" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type sto:Store" name="sto:Store" roleTypes="//@typeDefinitions/(a)roleTypes.2"> + <semanticAnnotations annotation="savara.samples.Purchasing@Store" name="conversationType"/> + </participantTypes> + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.1"> + <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/> + </channelTypes> + <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.2"> + <identities description="ID" tokens="//@typeDefinitions/(a)tokens.0"/> + </channelTypes> + </typeDefinitions> + <choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true"> + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.0"/> + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.1"/> + <variableDefinitions description="This is the variable buy" name="buy" type="//@typeDefinitions/(a)informationTypes.2"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/(a)informationTypes.5"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice" description="Is credit ok?"> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Valid"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyConfirmed" name="BuyConfirmedRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Invalid"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.3" action="Respond" faultName="CreditCheckFailed"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.1" action="Respond" faultName="BuyFailed"/> + </activities> + </activities> + </activities> + </choreographies> +</org.pi4soa.cdl:Package> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-15 13:03:58 UTC (rev 85) @@ -33,7 +33,6 @@ public static TestSuite suite() { TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); - /* suite.addTest(new BPELToConversationTest("ESBBroker@Broker")); suite.addTest(new BPELToConversationTest("ESBBroker@Buyer")); suite.addTest(new BPELToConversationTest("ESBBroker@CreditAgency")); @@ -45,8 +44,7 @@ suite.addTest(new BPELToConversationTest("ReqRespFault@Buyer")); suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); - */ - + return suite; } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation ESBBrokerProcess_Broker@Broker implements ESBBroker@Broker { +conversation ESBBrokerProcess_Broker@Broker implements LoanBroker@Broker { makeEnquiry(enquiry) from Buyer to Broker; while { getQuote(requestForQuote) from Broker to SupplierQuoteEngine; Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Buyer.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Buyer.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Buyer.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation ESBBrokerProcess_Buyer@Buyer implements ESBBroker@Buyer { +conversation ESBBrokerProcess_Buyer@Buyer implements LoanBroker@Buyer { makeEnquiry(enquiry) from Buyer to Broker; makeEnquiry(quoteList) from Broker to Buyer; if { Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)CreditAgency.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)CreditAgency.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)CreditAgency.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation ESBBrokerProcess_CreditAgency@CreditAgency implements ESBBroker@CreditAgency { +conversation ESBBrokerProcess_CreditAgency@CreditAgency implements Common@CreditAgency { if { checkCredit(CreditCheckRequest) from Broker to CreditAgency; if { Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierQuoteEngine.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierQuoteEngine.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierQuoteEngine.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation RequestForQuote_SupplierQuoteEngine@SupplierQuoteEngine implements ESBBroker@SupplierQuoteEngine { +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 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierTxnProcessor.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierTxnProcessor.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)SupplierTxnProcessor.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation CompleteTransaction_SupplierTxnProcessor@SupplierTxnProcessor implements ESBBroker@SupplierTxnProcessor { +conversation CompleteTransaction_SupplierTxnProcessor@SupplierTxnProcessor implements LoanBroker@SupplierTxnProcessor { if { confirm(orderConfirmed) from Broker to SupplierTxnProcessor; confirm(bookingReference) from SupplierTxnProcessor to Broker; Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Buyer.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Buyer.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Buyer.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation PurchaseGoodsProcess_Buyer@Buyer implements PurchaseGoods@Buyer { +conversation PurchaseGoodsProcess_Buyer@Buyer implements Purchasing@Buyer { buy(BuyRequest) from Buyer to Store; if { buy(BuyConfirmed) from Store to Buyer; Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation PurchaseGoodsProcess_CreditAgency@CreditAgency implements PurchaseGoods@CreditAgency { +conversation PurchaseGoodsProcess_CreditAgency@CreditAgency implements Common@CreditAgency { checkCredit(CreditCheckRequest) from Store to CreditAgency; if { checkCredit(CreditCheckOk) from CreditAgency to Store; Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Store.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Store.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods(a)Store.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation PurchaseGoodsProcess_Store@Store implements PurchaseGoods@Store { +conversation PurchaseGoodsProcess_Store@Store implements Purchasing@Store { buy(BuyRequest) from Buyer to Store; checkCredit(CreditCheckRequest) from Store to CreditAgency; if { Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Buyer.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Buyer.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Buyer.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation ReqRespFaultProcess_Buyer@Buyer implements ReqRespFault@Buyer { +conversation ReqRespFaultProcess_Buyer@Buyer implements LoanBroker@Buyer { checkCredit(CreditCheckRequest) from Buyer to Seller; if { checkCredit(CreditCheckOk) from Seller to Buyer; Added: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected (rev 0) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.expected 2009-11-15 13:03:58 UTC (rev 85) @@ -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 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.scv =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.scv 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault(a)Seller.scv 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,6 @@ namespace null; -conversation ReqRespFaultProcess_Seller@Seller implements ReqRespFault@Seller { +conversation ReqRespFaultProcess_Seller@Seller implements ReqRespFaultProcess@Seller { checkCredit(CreditCheckRequest) from Buyer to Seller; if { checkCredit(CreditCheckOk) from Seller to Buyer; Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Broker.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Broker.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Broker.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,9 +1,13 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@Broker" name="ESBBrokerProcess_Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BrokerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="BuyerToBrokerServiceLT"/> - <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> - <partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> - <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> + <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerServiceLT"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="tns:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> </partnerLinks> <variables> <variable messageType="enquiry" name="enquiryVar"/> @@ -15,46 +19,45 @@ <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> <variable messageType="orderRejected" name="orderRejectedVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> - <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="enquiryVar"/> + <receive createInstance="yes" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/> <while> <sequence> <scope> <sequence> - <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/> + <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior"/> </sequence> </scope> </sequence> </while> - <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="quoteListVar"/> + <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/> <pick> - <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="buyVar"> + <onMessage operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="buyVar"> <sequence> <scope> <sequence> <scope> <faultHandlers> - <catch faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="orderRejectedVar"/> + <reply faultName="tns:rejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/> - <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/> - <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="bookingReferenceVar"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior"/> + <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior"/> + <reply operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="bookingReferenceVar"/> </sequence> </scope> </sequence> </scope> </sequence> </onMessage> - <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT" variable="cancelVar"> + <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="cancelVar"> <sequence/> </onMessage> </pick> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,30 +1,33 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@Buyer" name="ESBBrokerProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="BuyerToBrokerLT" partnerRole="BrokerRequester"/> + <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerLT" partnerRole="BrokerRequester"/> </partnerLinks> <variables> <variable messageType="enquiry" name="enquiryVar"/> <variable messageType="quoteList" name="quoteListVar"/> <variable messageType="buy" name="buyVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> - <variable messageType="orderRejected" name="orderRejectedVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> - <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/> - <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BuyerBrokerCallbackPT" variable="quoteListVar"/> + <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> + <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/> <if> <sequence> <scope> <sequence> <scope> <faultHandlers> - <catch faultName="rejected" faultVariable="orderRejectedVar"> + <catch faultMessageType="orderRejected" faultName="rejected" faultVariable="orderRejectedVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="BrokerPT"/> + <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> </sequence> </scope> </sequence> @@ -32,7 +35,7 @@ </sequence> <else> <sequence> - <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/> + <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)CreditAgency.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,10 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@CreditAgency" name="ESBBrokerProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyServiceLT"/> + <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -9,17 +13,17 @@ </variables> <sequence> <pick> - <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"> + <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"> <sequence> <scope> <sequence> <if> <sequence> - <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierQuoteEngine.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierQuoteEngine.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierQuoteEngine.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,13 +1,15 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace=""/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierQuoteEnginePartnerLinkTypes.wsdl" namespace=""/> <partnerLinks> - <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/> + <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/> </partnerLinks> <variables> <variable messageType="requestForQuote" name="requestForQuoteVar"/> <variable messageType="quote" name="quoteVar"/> </variables> <sequence> - <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="requestForQuoteVar"/> - <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="quoteVar"/> + <receive createInstance="yes" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="requestForQuoteVar"/> + <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="quoteVar"/> </sequence> </process> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierTxnProcessor.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierTxnProcessor.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker(a)SupplierTxnProcessor.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,16 +1,18 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace=""/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierTxnProcessorPartnerLinkTypes.wsdl" namespace=""/> <partnerLinks> - <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/> + <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/> </partnerLinks> <variables> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> </variables> <sequence> - <pick> - <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="orderConfirmedVar"> + <pick createInstance="yes"> + <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="orderConfirmedVar"> <sequence> - <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="bookingReferenceVar"/> + <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="bookingReferenceVar"/> </sequence> </onMessage> </pick> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,21 +1,23 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@Buyer" name="PurchaseGoodsProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink name="BuyerToStore" partnerLinkType="BuyerToStoreLT" partnerRole="StoreRequester"/> + <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> </partnerLinks> <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="BuyFailed" name="buyFailedVar"/> </variables> <sequence> <scope> <faultHandlers> - <catch faultName="BuyFailed" faultVariable="buyFailedVar"> + <catch faultMessageType="BuyFailed" faultName="BuyFailed" faultVariable="buyFailedVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="StorePT"/> + <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="tns:StoreBehavior"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,9 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyServiceLT"/> + <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -8,14 +11,14 @@ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> - <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"/> + <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Store.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Store.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods(a)Store.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,29 +1,31 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@Store" name="PurchaseGoodsProcess_Store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.pi4soa.org/purchase" 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.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="BuyerToStoreServiceLT"/> - <partnerLink name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="tns:BuyerToStoreServiceLT"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> </partnerLinks> <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> <variable messageType="BuyFailed" name="buyFailedVar"/> </variables> <sequence> - <receive operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyRequestVar"/> + <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyRequestVar"/> <scope> <faultHandlers> - <catch faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyFailedVar"/> + <reply faultName="tns:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyFailedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/> - <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyConfirmedVar"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior"/> + <reply operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyConfirmedVar"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,21 +1,22 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault@Buyer" name="ReqRespFaultProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/> <partnerLinks> - <partnerLink name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/> + <partnerLink name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerLT" partnerRole="SellerRequester"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> <scope> <faultHandlers> - <catch faultName="insufficientCredit" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="insufficientCredit" faultVariable="creditCheckInvalidVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="SellerPT"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="tns:SellerBehavior"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Seller.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Seller.bpel 2009-11-15 09:51:13 UTC (rev 84) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault(a)Seller.bpel 2009-11-15 13:03:58 UTC (rev 85) @@ -1,6 +1,8 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault@Seller" name="ReqRespFaultProcess_Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SellerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/> <partnerLinks> - <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="BuyerToSellerServiceLT"/> + <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -8,14 +10,14 @@ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> - <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckRequestVar"/> + <receive createInstance="yes" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if>

16 years, 5 months

1
0
0 / 0

savara SVN: r84 - in runtime/trunk: distribution and 6 other directories.

by do-not-reply＠jboss.org

Author: jeff.yuchang Date: 2009-11-15 04:51:13 -0500 (Sun, 15 Nov 2009) New Revision: 84 Added: runtime/trunk/docs/pom.xml runtime/trunk/docs/samplesguide/ runtime/trunk/docs/userguide/ Removed: runtime/trunk/docs/cdl/ runtime/trunk/docs/docbook/ Modified: runtime/trunk/distribution/pom.xml runtime/trunk/pom.xml runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml runtime/trunk/samples/jbossesb/common/creditAgency/pom.xml runtime/trunk/samples/jbossesb/purchasing/store/pom.xml runtime/trunk/samples/pom.xml Log: * restructure the docs. Modified: runtime/trunk/distribution/pom.xml =================================================================== --- runtime/trunk/distribution/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/distribution/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -142,8 +142,8 @@ <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> </configuration> - </execution> - </executions> + </execution> + </executions> </plugin> </plugins> </build> Copied: runtime/trunk/docs/pom.xml (from rev 81, runtime/trunk/docs/docbook/pom.xml) =================================================================== --- runtime/trunk/docs/pom.xml (rev 0) +++ runtime/trunk/docs/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -0,0 +1,24 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.savara.runtime</groupId> + <artifactId>docs</artifactId> + <packaging>pom</packaging> + <name>Savara::Runtime::Docs</name> + + <parent> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <modules> + <module>userguide</module> + <module>samplesguide</module> + <module>gettingstartedguide</module> + </modules> + +</project> Copied: runtime/trunk/docs/samplesguide (from rev 80, runtime/trunk/docs/docbook/samplesguide) Copied: runtime/trunk/docs/userguide (from rev 80, runtime/trunk/docs/docbook/userguide) Modified: runtime/trunk/pom.xml =================================================================== --- runtime/trunk/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -39,6 +39,8 @@ <modules> <module>jbossesb</module> <module>samples</module> + <module>docs</module> + <module>distribution</module> </modules> <profiles> Modified: runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -8,7 +8,7 @@ <name>Savara::Samples::Broker</name> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>samples</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -20,7 +20,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <scope>provided</scope> </dependency> Modified: runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -21,7 +21,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <scope>provided</scope> </dependency> Modified: runtime/trunk/samples/jbossesb/common/creditAgency/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -2,14 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.samples</groupId> + <groupId>org.jboss.savara.runtime.samples</groupId> <artifactId>samples-creditAgency</artifactId> <packaging>jar</packaging> - <name>Savara::Samples::CreditAgency</name> - <url>http://www.jboss.org/overlord</url> + <name>Savara::Runtime::Samples::CreditAgency</name> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>samples</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -21,7 +20,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <scope>provided</scope> </dependency> Modified: runtime/trunk/samples/jbossesb/purchasing/store/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -2,14 +2,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.samples</groupId> + <groupId>org.jboss.savara.runtime.samples</groupId> <artifactId>samples-store</artifactId> <packaging>jar</packaging> - <name>Savara::Samples::Store</name> - <url>http://www.jboss.org/savara</url> + <name>Savara::Runtime::Samples::Store</name> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>samples</artifactId> <version>1.0-SNAPSHOT</version> </parent> @@ -21,7 +20,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <scope>provided</scope> </dependency> Modified: runtime/trunk/samples/pom.xml =================================================================== --- runtime/trunk/samples/pom.xml 2009-11-15 09:50:10 UTC (rev 83) +++ runtime/trunk/samples/pom.xml 2009-11-15 09:51:13 UTC (rev 84) @@ -35,7 +35,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <version>${savara.version}</version> <scope>provided</scope>

16 years, 5 months

1
0
0 / 0

savara SVN: r83 - in validator/trunk: docs and 1 other directory.

by do-not-reply＠jboss.org

Author: jeff.yuchang Date: 2009-11-15 04:50:10 -0500 (Sun, 15 Nov 2009) New Revision: 83 Added: validator/trunk/distribution/ validator/trunk/docs/ validator/trunk/docs/user/ Log: Copied: validator/trunk/docs/user (from rev 80, runtime/trunk/docs/cdl/user)

16 years, 5 months

1
0
0 / 0

savara SVN: r82 - methodology and 1 other directories.

by do-not-reply＠jboss.org

Author: jeff.yuchang Date: 2009-11-15 03:49:13 -0500 (Sun, 15 Nov 2009) New Revision: 82 Added: methodology/ methodology/branches/ methodology/tags/ methodology/trunk/ methodology/trunk/gettingstartedguide/ methodology/trunk/tooling/ Log: * adding docs Copied: methodology/trunk/gettingstartedguide (from rev 80, runtime/trunk/docs/docbook/gettingstartedguide) Copied: methodology/trunk/tooling (from rev 80, runtime/trunk/docs/tooling)

16 years, 5 months

1
0
0 / 0

savara SVN: r81 - in runtime/trunk: distribution and 6 other directories.

by do-not-reply＠jboss.org

Author: jeff.yuchang Date: 2009-11-15 03:46:08 -0500 (Sun, 15 Nov 2009) New Revision: 81 Removed: runtime/trunk/docs/docbook/gettingstartedguide/ runtime/trunk/docs/tooling/ Modified: runtime/trunk/distribution/pom.xml runtime/trunk/docs/docbook/pom.xml runtime/trunk/jbossesb/pom.xml runtime/trunk/pom.xml runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml runtime/trunk/samples/pom.xml Log: * SAVARA-43 Modified: runtime/trunk/distribution/pom.xml =================================================================== --- runtime/trunk/distribution/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/distribution/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -19,18 +19,18 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>distribution</artifactId> <packaging>pom</packaging> - <name>Savara::Distribution</name> + <name>Savara::Runtime::Distribution</name> <version>1.0-SNAPSHOT</version> - <url>http://www.jboss.org/overlord/savara</url> + <url>http://www.jboss.org/savara</url> <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <properties> @@ -39,29 +39,17 @@ <dependencies> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <version>${pom.version}</version> <classifier>dist</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.savara</groupId> - <artifactId>savara-validator-jbossesb</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.savara</groupId> - <artifactId>savara-validator-jbossesb</artifactId> - <version>${pom.version}</version> - <classifier>dist</classifier> - <type>zip</type> - </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> Modified: runtime/trunk/docs/docbook/pom.xml =================================================================== --- runtime/trunk/docs/docbook/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/docs/docbook/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -4,14 +4,14 @@ <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>docs</artifactId> <packaging>pom</packaging> - <name>Savara::docs</name> + <name>Savara::Runtime::Docs</name> <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> <version>1.0-SNAPSHOT</version> </parent> Modified: runtime/trunk/jbossesb/pom.xml =================================================================== --- runtime/trunk/jbossesb/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/jbossesb/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -2,16 +2,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>savara-runtime-jbossesb</artifactId> <packaging>jar</packaging> <name>Savara::Runtime::JBoss ESB</name> <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> <version>1.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <properties> Modified: runtime/trunk/pom.xml =================================================================== --- runtime/trunk/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -2,17 +2,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> <version>1.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Savara</name> - <url>http://www.jboss.org/overlord/savara</url> + <name>Savara Runtime</name> + <url>http://www.jboss.org/savara</url> <description> - The JBoss SAVARA Project. + The JBoss SAVARA Runtime. </description> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/soag/savara/trunk</connection> + <connection>scm:svn:https://svn.jboss.org/repos/savara/runtime</connection> </scm> <developers> <developer> @@ -37,20 +37,12 @@ </developer> </developers> <modules> - <module>runtime/jbossesb</module> - <module>validator/jbossesb</module> + <module>jbossesb</module> <module>samples</module> </modules> <profiles> <profile> - <id>release</id> - <modules> - <module>docs/docbook</module> - <module>distribution</module> - </modules> - </profile> - <profile>  -  - </repositories> <distributionManagement> @@ -241,7 +224,5 @@ <url>dav:https://snapshots.jboss.org/maven2</url> </snapshotRepository> </distributionManagement> - </project> - Modified: runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -2,11 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.samples</groupId> + <groupId>org.jboss.savara.runtime.samples</groupId> <artifactId>samples-broker</artifactId> <packaging>jar</packaging> <name>Savara::Samples::Broker</name> - <url>http://www.jboss.org/overlord</url> <parent> <groupId>org.jboss.savara</groupId> Modified: runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml =================================================================== --- runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -2,14 +2,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara.samples</groupId> + <groupId>org.jboss.savara.runtime.samples</groupId> <artifactId>samples-supplier</artifactId> <packaging>jar</packaging> - <name>Savara::Samples::Supplier</name> + <name>Savara::Runtime::Samples::Supplier</name> <url>http://www.jboss.org/overlord</url> <parent> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>samples</artifactId> <version>1.0-SNAPSHOT</version> </parent> Modified: runtime/trunk/samples/pom.xml =================================================================== --- runtime/trunk/samples/pom.xml 2009-11-15 07:35:43 UTC (rev 80) +++ runtime/trunk/samples/pom.xml 2009-11-15 08:46:08 UTC (rev 81) @@ -2,15 +2,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.savara</groupId> + <groupId>org.jboss.savara.runtime</groupId> <artifactId>samples</artifactId> <packaging>pom</packaging> <version>1.0-SNAPSHOT</version> - <name>Savara::Samples</name> + <name>Savara::Runtime::Samples</name> <parent> - <groupId>org.jboss</groupId> - <artifactId>savara</artifactId> + <groupId>org.jboss.savara</groupId> + <artifactId>runtime</artifactId> <version>1.0-SNAPSHOT</version> </parent>

16 years, 5 months

1
0
0 / 0

savara SVN: r80 - /.

by do-not-reply＠jboss.org

Author: jeff.yuchang Date: 2009-11-15 02:35:43 -0500 (Sun, 15 Nov 2009) New Revision: 80 Removed: trunk/ Log: * remove the trunk.

16 years, 5 months

1
0
0 / 0

savara SVN: r79 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator: results and 1 other directory.

by do-not-reply＠jboss.org

Author: objectiser Date: 2009-11-09 17:45:45 -0500 (Mon, 09 Nov 2009) New Revision: 79 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel Log: Updated test results. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-09 22:45:45 UTC (rev 79) @@ -37,8 +37,6 @@ TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker")); - - /* suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", @@ -52,7 +50,6 @@ suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller")); - */ return suite; } @@ -132,6 +129,11 @@ defn = defns.get(0); } + // Check if subpath definition defined + if (m_subDefinitionPath != null) { + defn = defn.getSubDefinition(m_subDefinitionPath); + } + java.util.List<org.scribble.model.Role> roles=defn.getRoles(); //new org.scribble.model.Role(m_role); Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,30 +1,33 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@Buyer" name="ESBBrokerProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="BuyerToBrokerLT" partnerRole="BrokerRequester"/> + <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerLT" partnerRole="BrokerRequester"/> </partnerLinks> <variables> <variable messageType="enquiry" name="enquiryVar"/> <variable messageType="quoteList" name="quoteListVar"/> <variable messageType="buy" name="buyVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> - <variable messageType="orderRejected" name="orderRejectedVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> - <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/> - <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BuyerBrokerCallbackPT" variable="quoteListVar"/> + <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> + <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/> <if> <sequence> <scope> <sequence> <scope> <faultHandlers> - <catch faultName="rejected" faultVariable="orderRejectedVar"> + <catch faultMessageType="orderRejected" faultName="rejected" faultVariable="orderRejectedVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="BrokerPT"/> + <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> </sequence> </scope> </sequence> @@ -32,7 +35,7 @@ </sequence> <else> <sequence> - <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/> + <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,6 +1,10 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@CreditAgency" name="ESBBrokerProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyServiceLT"/> + <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -9,17 +13,17 @@ </variables> <sequence> <pick> - <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"> + <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"> <sequence> <scope> <sequence> <if> <sequence> - <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,13 +1,15 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace=""/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierQuoteEnginePartnerLinkTypes.wsdl" namespace=""/> <partnerLinks> - <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/> + <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/> </partnerLinks> <variables> <variable messageType="requestForQuote" name="requestForQuoteVar"/> <variable messageType="quote" name="quoteVar"/> </variables> <sequence> - <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="requestForQuoteVar"/> - <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="quoteVar"/> + <receive createInstance="yes" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="requestForQuoteVar"/> + <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="quoteVar"/> </sequence> </process> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,16 +1,18 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace=""/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierTxnProcessorPartnerLinkTypes.wsdl" namespace=""/> <partnerLinks> - <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/> + <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/> </partnerLinks> <variables> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> </variables> <sequence> - <pick> - <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="orderConfirmedVar"> + <pick createInstance="yes"> + <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="orderConfirmedVar"> <sequence> - <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="bookingReferenceVar"/> + <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="bookingReferenceVar"/> </sequence> </onMessage> </pick> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,21 +1,23 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@Buyer" name="PurchaseGoodsProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink name="BuyerToStore" partnerLinkType="BuyerToStoreLT" partnerRole="StoreRequester"/> + <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> </partnerLinks> <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="BuyFailed" name="buyFailedVar"/> </variables> <sequence> <scope> <faultHandlers> - <catch faultName="BuyFailed" faultVariable="buyFailedVar"> + <catch faultMessageType="BuyFailed" faultName="BuyFailed" faultVariable="buyFailedVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="StorePT"/> + <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="tns:StoreBehavior"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,6 +1,9 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyServiceLT"/> + <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -8,14 +11,14 @@ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> - <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"/> + <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,29 +1,31 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods@Store" name="PurchaseGoodsProcess_Store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.pi4soa.org/purchase" 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.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/> <partnerLinks> - <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="BuyerToStoreServiceLT"/> - <partnerLink name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="tns:BuyerToStoreServiceLT"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> </partnerLinks> <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> <variable messageType="BuyFailed" name="buyFailedVar"/> </variables> <sequence> - <receive operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyRequestVar"/> + <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyRequestVar"/> <scope> <faultHandlers> - <catch faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyFailedVar"/> + <reply faultName="tns:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyFailedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/> - <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyConfirmedVar"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior"/> + <reply operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyConfirmedVar"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,21 +1,22 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault@Buyer" name="ReqRespFaultProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/> <partnerLinks> - <partnerLink name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/> + <partnerLink name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerLT" partnerRole="SellerRequester"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> <scope> <faultHandlers> - <catch faultName="insufficientCredit" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="insufficientCredit" faultVariable="creditCheckInvalidVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="SellerPT"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="tns:SellerBehavior"/> </sequence> </scope> </sequence> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2009-11-08 23:29:16 UTC (rev 78) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2009-11-09 22:45:45 UTC (rev 79) @@ -1,6 +1,8 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault@Seller" name="ReqRespFaultProcess_Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="SellerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/> <partnerLinks> - <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="BuyerToSellerServiceLT"/> + <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerServiceLT"/> </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> @@ -8,14 +10,14 @@ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> </variables> <sequence> - <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckRequestVar"/> + <receive createInstance="yes" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckRequestVar"/> <if> <sequence> - <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckOkVar"/> + <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckOkVar"/> </sequence> <else> <sequence> - <reply faultName="insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckInvalidVar"/> + <reply faultName="tns:insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckInvalidVar"/> </sequence> </else> </if>

16 years, 5 months

1
0
0 / 0

savara SVN: r78 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: java/org/jboss/savara/tools/bpel/model/util and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2009-11-08 18:29:16 -0500 (Sun, 08 Nov 2009) New Revision: 78 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java Log: Deal with some warnings. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 23:29:16 UTC (rev 78) @@ -400,9 +400,9 @@ public boolean update(ModelChangeContext context, Model model, ModelObject fromObj, ModelObject toObj) { boolean ret=false; - BPELLanguageModel bpelModel=(BPELLanguageModel)model; - ConversationInteraction fromInteraction=(ConversationInteraction)fromObj; - ConversationInteraction toInteraction=(ConversationInteraction)toObj; + //BPELLanguageModel bpelModel=(BPELLanguageModel)model; + //ConversationInteraction fromInteraction=(ConversationInteraction)fromObj; + //ConversationInteraction toInteraction=(ConversationInteraction)toObj; return(ret); } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 23:21:33 UTC (rev 77) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 23:29:16 UTC (rev 78) @@ -34,6 +34,7 @@ * @param context The context * @param conv The conversation */ + @SuppressWarnings("unchecked") public static void addContracts(ModelChangeContext context, Conversation conv) { java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) @@ -86,6 +87,7 @@ * @param context The context * @param conv The conversation */ + @SuppressWarnings("unchecked") public static void removeContracts(ModelChangeContext context, Conversation conv) { java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 23:21:33 UTC (rev 77) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 23:29:16 UTC (rev 78) @@ -20,7 +20,6 @@ import org.jboss.savara.tools.bpel.model.component.BPELActivity; import org.jboss.savara.tools.bpel.model.component.Invoke; import org.jboss.savara.tools.bpel.model.component.Sequence; -import org.scribble.conversation.model.If; import org.scribble.model.*; /** Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 23:21:33 UTC (rev 77) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 23:29:16 UTC (rev 78) @@ -45,8 +45,8 @@ suite.addTest(new BPELToConversationTest("ReqRespFault@Buyer")); suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); + */ - */ return suite; } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 23:21:33 UTC (rev 77) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 23:29:16 UTC (rev 78) @@ -19,7 +19,6 @@ import junit.framework.TestCase; -import org.jboss.savara.tools.bpel.model.util.InteractionUtil; import org.scribble.conversation.model.*; import org.scribble.model.*;

16 years, 5 months

1
0
0 / 0

savara SVN: r77 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: java/org/jboss/savara/tools/bpel/model/util and 5 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2009-11-08 18:21:33 -0500 (Sun, 08 Nov 2009) New Revision: 77 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java Log: Update to use scribble mechanism for determining initial interactions for 'createInstance' attribute. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -95,22 +95,19 @@ Sequence seq=new Sequence(bpelModel); + ModelChangeUtils.addContracts(context, conv); + // Check if root conversation if (conv.getParent() instanceof Model) { - ModelChangeUtils.initializeContracts(context, conv); - // Set the name of the process bpelModel.getBPELProcess().setName(conv.getLocatedName().getName()+"_"+ conv.getLocatedName().getRole().getName()); // Get contract - //Contract contract=ModelChangeUtils.getContract(context, conv.getLocatedName().getRole().getName()); + Contract contract=ModelChangeUtils.getContract(context, conv.getLocatedName().getRole().getName()); - if (conv.getLocatedName().getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)conv.getLocatedName(). - getRole().getAnnotations().get(Contract.class.getName()); - + if (contract != null) { roleNamespace = contract.getNamespace(); // Set namespace @@ -201,6 +198,8 @@ // Reset old parent context.setParent(parent); + ModelChangeUtils.removeContracts(context, conv); + return(true); } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -108,9 +108,8 @@ String mainPrefix=null; - if (context.getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)context.getRole().getAnnotations().get(Contract.class.getName()); - + Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + if (contract != null) { mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace()); } @@ -128,12 +127,11 @@ } } - if (roleType != null && - roleType.getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)roleType.getAnnotations().get(Contract.class.getName()); + if (roleType != null) { + contract = ModelChangeUtils.getContract(context, roleType.getName()); // Assume that contract only has one interface for now - if (contract.getInterfaces().size() > 0) { + if (contract != null && contract.getInterfaces().size() > 0) { intf = contract.getInterfaces().get(0); } } @@ -286,7 +284,7 @@ } // Check if create instance - if (InteractionUtil.isFirstInteraction(interaction)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(interaction)) { ((Receive)act).setCreateInstance(true); } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -224,9 +224,8 @@ String mainPrefix=null; - if (context.getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)context.getRole().getAnnotations().get(Contract.class.getName()); - + Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + if (contract != null) { mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace()); } @@ -249,19 +248,17 @@ pl.setPartnerLinkType(plt); - if (role.getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName()); + contract = ModelChangeUtils.getContract(context, role.getName()); + + if (contract != null && contract.getInterfaces().size() > 0) { + Interface intf = contract.getInterfaces().get(0); - if (contract.getInterfaces().size() > 0) { - Interface intf = contract.getInterfaces().get(0); - - portType = intf.getName(); - - String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); - - if (prefix != null) { - portType = prefix+":"+portType; - } + portType = intf.getName(); + + String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); + + if (prefix != null) { + portType = prefix+":"+portType; } } } else { @@ -280,22 +277,18 @@ //portType = role.getName()+ // recv.getFromRole().getName()+"CallbackPT"; - if (recv.getFromRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)recv.getFromRole().getAnnotations().get(Contract.class.getName()); + contract = ModelChangeUtils.getContract(context, recv.getFromRole().getName()); + if (contract != null && contract.getInterfaces().size() > 0) { + Interface intf = contract.getInterfaces().get(0); - if (contract.getInterfaces().size() > 0) { - Interface intf = contract.getInterfaces().get(0); - - portType = intf.getName(); - - String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); - - if (prefix != null) { - portType = prefix+":"+portType; - } + portType = intf.getName(); + + String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); + + if (prefix != null) { + portType = prefix+":"+portType; } } - } // Create partner link @@ -321,7 +314,7 @@ } // Check if create instance - if (InteractionUtil.isFirstInteraction(recv)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(recv)) { act.setCreateInstance(true); } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 23:21:33 UTC (rev 77) @@ -28,26 +28,30 @@ public class ModelChangeUtils { /** - * This method checks whether the contracts need to be initialized. + * This method adds any contracts associated with roles defined in the + * supplied conversation. * * @param context The context * @param conv The conversation */ - public static void initializeContracts(ModelChangeContext context, Conversation conv) { + public static void addContracts(ModelChangeContext context, Conversation conv) { - if (context.getProperties().containsKey(Contract.class.getName()) == false) { - java.util.Map<String,Contract> contracts=new java.util.HashMap<String, Contract>(); + java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) + context.getProperties().get(Contract.class.getName()); + + if (contracts == null) { + contracts = new java.util.HashMap<String, Contract>(); - if (conv.getLocatedName().getRole() != null) { - initializeRoleContract(conv.getLocatedName().getRole(), contracts); - } - - for (Role r : conv.getRoles()) { - initializeRoleContract(r, contracts); - } - context.getProperties().put(Contract.class.getName(), contracts); } + + if (conv.getLocatedName().getRole() != null) { + addRoleContract(conv.getLocatedName().getRole(), contracts); + } + + for (Role r : conv.getRoles()) { + addRoleContract(r, contracts); + } } /** @@ -56,7 +60,7 @@ * @param role The role * @param contracts The map of roles to contracts */ - protected static void initializeRoleContract(Role role, java.util.Map<String,Contract> contracts) { + protected static void addRoleContract(Role role, java.util.Map<String,Contract> contracts) { if (role != null && role.getAnnotations().containsKey(Contract.class.getName())) { contracts.put(role.getName(), (Contract)role.getAnnotations().get(Contract.class.getName())); @@ -64,6 +68,42 @@ } /** + * This method removes the contract associated with the supplied role. + * + * @param role The role + * @param contracts The map of roles to contracts + */ + protected static void removeRoleContract(Role role, java.util.Map<String,Contract> contracts) { + if (role != null && role.getAnnotations().containsKey(Contract.class.getName())) { + contracts.remove(role.getName()); + } + } + + /** + * This method removes any contracts associated with roles defined in the + * supplied conversation. + * + * @param context The context + * @param conv The conversation + */ + public static void removeContracts(ModelChangeContext context, Conversation conv) { + + java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) + context.getProperties().get(Contract.class.getName()); + + if (contracts != null) { + + if (conv.getLocatedName().getRole() != null) { + removeRoleContract(conv.getLocatedName().getRole(), contracts); + } + + for (Role r : conv.getRoles()) { + removeRoleContract(r, contracts); + } + } + } + + /** * This method returns the contract associated with the supplied role. * * @param contezt The context Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 23:21:33 UTC (rev 77) @@ -98,53 +98,6 @@ * @param interaction The interaction * @return Whether the interaction is the first in the conversation */ - public static boolean isFirstInteraction(Interaction interaction) { - boolean ret=false; - - if (interaction.getParent() instanceof Block && - interaction.getParent().getParent() != null) { - ModelObject parent=(ModelObject)interaction.getParent().getParent(); - - // Check that first interaction in block - Block block=(Block)interaction.getParent(); - ret = true; - - for (int i=0; ret && i < block.getContents().size(); i++) { - if (block.getContents().get(i) == interaction) { - break; - } else if (block.getContents().get(i) instanceof Interaction) { - ret = false; - } - } - - // Check if definition - if (ret) { - - if (parent instanceof If) { - if (parent.getParent() instanceof Block) { - parent = parent.getParent().getParent(); - } - } - - if (parent instanceof Definition) { - - // Check if it is the top level definition - ret = (parent.getParent() instanceof Model); - - // TODO: How do we know if this conversation is the - // top level, or has it been 'run' by the top level - // conversation? While the conversation used to - // generate the BPEL is produced as one definition, - // this should not be a problem. - } else { - ret = false; - } - } - } - - return(ret); - } - /** * This method determines whether the supplied activity * is either an invoke, or a sequence that has an Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -34,9 +34,11 @@ public class GeneratorTest extends TestCase { public static TestSuite suite() { - TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests"); + TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker")); + + /* suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", @@ -50,7 +52,8 @@ suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller")); - + */ + return suite; } @@ -119,17 +122,9 @@ org.scribble.projector.Projector projector= new org.scribble.projector.DefaultProjector(); - org.scribble.model.Role role= - new org.scribble.model.Role(m_role); + org.scribble.model.Role role=null; - org.scribble.model.Model projected= - projector.project(ref, model, - m_subDefinitionPath, role, l); - - ModelGenerator generator=(ModelGenerator) - RegistryFactory.getRegistry().getExtension( - ModelGenerator.class, null); - + // Obtain role from definition java.util.List<Definition> defns=model.getDefinitions(); Definition defn=null; @@ -137,34 +132,63 @@ defn = defns.get(0); } - if (generator != null && defn != null) { - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - targetRef.setAlias(m_name); - targetRef.setLocatedRole(m_role); + java.util.List<org.scribble.model.Role> roles=defn.getRoles(); + //new org.scribble.model.Role(m_role); + + for (int i=0; role == null && i < roles.size(); i++) { + if (roles.get(i).getName().equals(m_role)) { + role = roles.get(i); + } + } + + if (role == null) { + result.addError(this, + new Throwable("Role '"+m_role+"' not found")); + } else { + + org.scribble.model.Model projected= + projector.project(ref, model, + m_subDefinitionPath, role, l); - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - generator.generate(targetRef, - defn.getLocatedName().getRole(), - target, projected); + ModelGenerator generator=(ModelGenerator) + RegistryFactory.getRegistry().getExtension( + ModelGenerator.class, null); + + defns = projected.getDefinitions(); + defn = null; - if (target.getBPELProcess().getDOMElement() != null) { - try { - String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); - checkResults(result, text); - } catch(Exception e) { - result.addError(this, e); + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + targetRef.setAlias(m_name); + targetRef.setLocatedRole(m_role); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + generator.generate(targetRef, role, + target, projected); + + if (target.getBPELProcess().getDOMElement() != null) { + try { + String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); + checkResults(result, text); + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("No BPEL generated")); } + } else { result.addError(this, - new Throwable("No BPEL generated")); + new Throwable("Unable to find Model Generator")); } - - } else { - result.addError(this, - new Throwable("Unable to find Model Generator")); } } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-11-08 23:21:33 UTC (rev 77) @@ -1,9 +1,13 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@Broker" name="ESBBrokerProcess_Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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" 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"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BrokerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="BuyerToBrokerServiceLT"/> - <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> - <partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> - <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> + <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerServiceLT"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="tns:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> </partnerLinks> <variables> <variable messageType="enquiry" name="enquiryVar"/> @@ -15,46 +19,45 @@ <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> <variable messageType="orderRejected" name="orderRejectedVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> - <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="enquiryVar"/> + <receive createInstance="yes" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/> <while> <sequence> <scope> <sequence> - <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/> + <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior"/> </sequence> </scope> </sequence> </while> - <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="quoteListVar"/> + <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/> <pick> - <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="buyVar"> + <onMessage operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="buyVar"> <sequence> <scope> <sequence> <scope> <faultHandlers> - <catch faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="orderRejectedVar"/> + <reply faultName="tns:rejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/> - <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/> - <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="bookingReferenceVar"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior"/> + <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior"/> + <reply operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="bookingReferenceVar"/> </sequence> </scope> </sequence> </scope> </sequence> </onMessage> - <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT" variable="cancelVar"> + <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="cancelVar"> <sequence/> </onMessage> </pick> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -33,6 +33,7 @@ public static TestSuite suite() { TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); + /* suite.addTest(new BPELToConversationTest("ESBBroker@Broker")); suite.addTest(new BPELToConversationTest("ESBBroker@Buyer")); suite.addTest(new BPELToConversationTest("ESBBroker@CreditAgency")); @@ -45,6 +46,7 @@ suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); + */ return suite; } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -44,7 +44,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); Contract c2=ModelChangeUtils.getContract(context, MY_ROLE); @@ -71,11 +71,21 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); + Conversation conv2=new Conversation(); + LocatedName ln2=new LocatedName(); + Role r2=new Role(); + r2.setName(MY_OTHER_ROLE); + Contract c2=new Contract(); - r.getAnnotations().put(Contract.class.getName(), c2); + r2.getAnnotations().put(Contract.class.getName(), c2); + ln2.setRole(r2); + conv2.setLocatedName(ln2); + + ModelChangeUtils.addContracts(context, conv2); + Contract c3=ModelChangeUtils.getContract(context, MY_ROLE); if (c3 == null) { @@ -85,6 +95,16 @@ if (c3 != c) { fail("Contract not the same as the one stored"); } + + Contract c4=ModelChangeUtils.getContract(context, MY_OTHER_ROLE); + + if (c4 == null) { + fail("Contract not found"); + } + + if (c4 != c2) { + fail("Contract2 not the same as the one stored"); + } } public void testPushRoleContractMapping() { @@ -101,7 +121,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); java.util.List<DeclarationBinding> bindings=new java.util.Vector<DeclarationBinding>(); @@ -142,7 +162,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); java.util.List<DeclarationBinding> bindings=new java.util.Vector<DeclarationBinding>(); Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -34,7 +34,7 @@ c.getBlock().getContents().add(i1); - if (InteractionUtil.isFirstInteraction(i1) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i1) == false) { fail("Interaction should be first in conversation"); } } @@ -50,7 +50,7 @@ c.getBlock().getContents().add(i1); c.getBlock().getContents().add(i2); - if (InteractionUtil.isFirstInteraction(i2)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i2)) { fail("Interaction should NOT be first in conversation"); } } @@ -77,15 +77,15 @@ b2.getContents().add(i2); b2.getContents().add(i3); - if (InteractionUtil.isFirstInteraction(i1) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i1) == false) { fail("Interaction should be first in conversation"); } - if (InteractionUtil.isFirstInteraction(i2) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i2) == false) { fail("Interaction should be first in conversation"); } - if (InteractionUtil.isFirstInteraction(i3)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i3)) { fail("Interaction should NOT be first in conversation"); } }

16 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits November 2009