[savara-commits] 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.

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>