Author: objectiser
Date: 2009-04-22 18:18:00 -0400 (Wed, 22 Apr 2009)
New Revision: 593
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBroker.cdm
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoods.cdm
Removed:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess(a)Broker.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Store.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBrokerProcess(a)Broker.scv
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoodsProcess(a)Store.scv
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
Log:
Fix issue where fault activities were not being placed in the catch sequence. Still need
to detect whether an 'if' is based on receiving, and therefore create a pick.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-04-22
22:18:00 UTC (rev 593)
@@ -124,7 +124,7 @@
Object parent=context.getParent();
- context.setParent(seq);
+ context.setParent(subseq);
for (int j=1; j < path.getContents().size(); j++) {
context.insert(model, path.getContents().get(j), null);
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-22
22:18:00 UTC (rev 593)
@@ -34,9 +34,9 @@
public static TestSuite suite() {
TestSuite suite = new TestSuite("Conversation->BPEL Generator
Tests");
- suite.addTest(new ConversationToBPELTest("ESBBrokerProcess@Broker"));
- suite.addTest(new
ConversationToBPELTest("PurchaseGoodsProcess@Store"));
suite.addTest(new ConversationToBPELTest("EventHandler@Store"));
+ suite.addTest(new ChoreographyToBPELTest("ESBBroker",
"Broker"));
+ suite.addTest(new ChoreographyToBPELTest("PurchaseGoods",
"Store"));
suite.addTest(new ChoreographyToBPELTest("ReqRespFault",
"Buyer"));
suite.addTest(new ChoreographyToBPELTest("ReqRespFault",
"Seller"));
return suite;
Copied:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel
(from rev 584,
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess(a)Broker.bpel)
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-04-22
22:18:00 UTC (rev 593)
@@ -0,0 +1,51 @@
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <partnerLinks>
+ <partnerLink myRole="BrokerService" name="BuyerToBroker"
partnerLinkType="BuyerToBrokerServiceLT"/>
+ <partnerLink myRole="BrokerRequester"
name="BrokerToSupplierQuoteEngine"
partnerLinkType="BrokerToSupplierQuoteEngineLT"
partnerRole="SupplierQuoteEngineRequester"/>
+ <partnerLink myRole="BrokerRequester"
name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
+ <partnerLink myRole="BrokerRequester"
name="BrokerToSupplierTxnProcessor"
partnerLinkType="BrokerToSupplierTxnProcessorLT"
partnerRole="SupplierTxnProcessorRequester"/>
+ </partnerLinks>
+ <sequence>
+ <receive operation="makeEnquiry"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <while>
+ <sequence>
+ <scope>
+ <sequence>
+ <invoke operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="SupplierQuoteEnginePT"/>
+ <receive operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="BrokerSupplierQuoteEngineCallbackPT"/>
+ </sequence>
+ </scope>
+ </sequence>
+ </while>
+ <reply operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="BrokerPT"/>
+ <if>
+ <sequence>
+ <scope>
+ <sequence>
+ <receive operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke operation="checkCredit"
partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ <if>
+ <sequence>
+ <receive operation="checkCredit"
partnerLink="BrokerToCreditAgency"
portType="BrokerCreditAgencyCallbackPT"/>
+ <invoke operation="confirm"
partnerLink="BrokerToSupplierTxnProcessor"
portType="SupplierTxnProcessorPT"/>
+ <receive operation="confirm"
partnerLink="BrokerToSupplierTxnProcessor"
portType="BrokerSupplierTxnProcessorCallbackPT"/>
+ <reply operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ </sequence>
+ <else>
+ <sequence>
+ <receive operation="checkCredit"
partnerLink="BrokerToCreditAgency"
portType="BrokerCreditAgencyCallbackPT"/>
+ <reply operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+ </scope>
+ </sequence>
+ <else>
+ <sequence>
+ <receive operation="cancel"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
Deleted:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess(a)Broker.bpel
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess(a)Broker.bpel 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess(a)Broker.bpel 2009-04-22
22:18:00 UTC (rev 593)
@@ -1,51 +0,0 @@
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
- <partnerLinks>
- <partnerLink myRole="BrokerService" name="BuyerToBroker"
partnerLinkType="BuyerToBrokerServiceLT"/>
- <partnerLink myRole="BrokerRequester"
name="BrokerToSupplierQuoteEngine"
partnerLinkType="BrokerToSupplierQuoteEngineLT"
partnerRole="SupplierQuoteEngineRequester"/>
- <partnerLink myRole="BrokerRequester"
name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
- <partnerLink myRole="BrokerRequester"
name="BrokerToSupplierTxnProcessor"
partnerLinkType="BrokerToSupplierTxnProcessorLT"
partnerRole="SupplierTxnProcessorRequester"/>
- </partnerLinks>
- <sequence>
- <receive operation="makeEnquiry"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <while>
- <sequence>
- <scope>
- <sequence>
- <invoke operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="SupplierQuoteEnginePT"/>
- <receive operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="BrokerSupplierQuoteEngineCallbackPT"/>
- </sequence>
- </scope>
- </sequence>
- </while>
- <reply operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="BrokerPT"/>
- <if>
- <sequence>
- <scope>
- <sequence>
- <receive operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <invoke operation="checkCredit"
partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- <if>
- <sequence>
- <receive operation="checkCredit"
partnerLink="BrokerToCreditAgency"
portType="BrokerCreditAgencyCallbackPT"/>
- <invoke operation="confirm"
partnerLink="BrokerToSupplierTxnProcessor"
portType="SupplierTxnProcessorPT"/>
- <receive operation="confirm"
partnerLink="BrokerToSupplierTxnProcessor"
portType="BrokerSupplierTxnProcessorCallbackPT"/>
- <reply operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
- </sequence>
- <else>
- <sequence>
- <receive operation="checkCredit"
partnerLink="BrokerToCreditAgency"
portType="BrokerCreditAgencyCallbackPT"/>
- <reply operation="buy"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
- </sequence>
- </else>
- </if>
- </sequence>
- </scope>
- </sequence>
- <else>
- <sequence>
- <receive operation="cancel"
partnerLink="BuyerToBroker" portType="BrokerPT"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
Copied:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel
(from rev 584,
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Store.bpel)
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-04-22
22:18:00 UTC (rev 593)
@@ -0,0 +1,22 @@
+<process name="PurchaseGoodsProcess_Store"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <partnerLinks>
+ <partnerLink myRole="StoreService" name="BuyerToStore"
partnerLinkType="BuyerToStoreServiceLT"/>
+ <partnerLink name="StoreToCreditAgency"
partnerLinkType="StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
+ </partnerLinks>
+ <sequence>
+ <receive operation="buy" partnerLink="BuyerToStore"
portType="StorePT"/>
+ <scope>
+ <faultHandlers>
+ <catch faultName="CreditCheckFailed">
+ <sequence>
+ <reply faultName="BuyFailed"
operation="buy" partnerLink="BuyerToStore"
portType="StorePT"/>
+ </sequence>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
+ <reply operation="buy" partnerLink="BuyerToStore"
portType="StorePT"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Deleted:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Store.bpel
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Store.bpel 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Store.bpel 2009-04-22
22:18:00 UTC (rev 593)
@@ -1,22 +0,0 @@
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
- <partnerLinks>
- <partnerLink myRole="StoreService" name="BuyerToStore"
partnerLinkType="BuyerToStoreServiceLT"/>
- <partnerLink myRole="StoreRequester"
name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
- </partnerLinks>
- <sequence>
- <receive operation="buy" partnerLink="BuyerToStore"
portType="StorePT"/>
- <invoke operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
- <if>
- <sequence>
- <receive operation="checkCredit"
partnerLink="StoreToCreditAgency"
portType="StoreCreditAgencyCallbackPT"/>
- <reply operation="buy" partnerLink="BuyerToStore"
portType="StorePT"/>
- </sequence>
- <else>
- <sequence>
- <receive operation="checkCredit"
partnerLink="StoreToCreditAgency"
portType="StoreCreditAgencyCallbackPT"/>
- <reply operation="buy"
partnerLink="BuyerToStore" portType="StorePT"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBroker.cdm
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBroker.cdm
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBroker.cdm 2009-04-22
22:18:00 UTC (rev 593)
@@ -0,0 +1,124 @@
+<?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 ESBBroker" name="ESBBroker"
author="gary" version="0.2"
targetNamespace="http://www.pi4soa.org/ESBBroker">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for ESBBroker"
prefix="tns"
uRI="http://www.pi4soa.org/ESBBroker"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd"
uRI="http://www.w3.org/2001/XMLSchema"/>
+ <informationTypes description="This is the information type
BookingReference" name="BookingReference"
elementName="bookingReference"/>
+ <informationTypes description="This is the information type Buy"
name="Buy" elementName="buy"/>
+ <informationTypes description="This is the information type Cancel"
name="Cancel" elementName="cancel"/>
+ <informationTypes description="This is the information type
CreditInformation" name="CreditInformation"
elementName="CreditCheckRequest"/>
+ <informationTypes description="This is the information type
CreditInvalid" name="CreditInvalid"
elementName="CreditCheckInvalid"/>
+ <informationTypes description="This is the information type CreditValid"
name="CreditValid" elementName="CreditCheckOk"/>
+ <informationTypes description="This is the information type Enquiry"
name="Enquiry" typeName="" elementName="enquiry"/>
+ <informationTypes description="This is the information type
OrderConfirmed" name="OrderConfirmed"
elementName="orderConfirmed"/>
+ <informationTypes description="This is the information type
OrderRejected" name="OrderRejected"
elementName="orderRejected"/>
+ <informationTypes description="This is the information type Quote"
name="Quote" elementName="quote"/>
+ <informationTypes description="This is the information type QuoteList"
name="QuoteList" elementName="quoteList"/>
+ <informationTypes description="This is the information type
RequestForQuote" name="RequestForQuote"
elementName="requestForQuote"/>
+ <informationTypes description="This is the information type URIType"
name="URIType"/>
+ <tokens description="This is the token URI" name="URI"
informationType="//@typeDefinitions/(a)informationTypes.12"/>
+ <roleTypes description="This is the role type Broker"
name="Broker">
+ <behaviors description="This is the behavior BrokerBehavior"
name="BrokerBehavior"/>
+ </roleTypes>
+ <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 Supplier"
name="Supplier">
+ <behaviors description="This is the behavior SupplierBehavior"
name="SupplierBehavior"/>
+ </roleTypes>
+ <relationshipTypes description="Relationship between Broker and
CreditAgency" name="BrokerToCreditAgencyRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.0"
secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <relationshipTypes description="Relationship between Broker and
Supplier" name="BrokerToSupplierRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.0"
secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
+ <relationshipTypes description="Relationship between Buyer and Broker"
name="BuyerToBrokerRel"
firstRoleType="//@typeDefinitions/(a)roleTypes.1"
secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <participantTypes description="This is the participant type Broker"
name="Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0">
+ <semanticAnnotations
annotation="overlord.cdl.samples.LoanBroker@Broker"
name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Buyer"
name="Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1">
+ <semanticAnnotations
annotation="overlord.cdl.samples.LoanBroker@Buyer"
name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type
CreditAgency" name="CreditAgency"
roleTypes="//@typeDefinitions/(a)roleTypes.2">
+ <semanticAnnotations
annotation="overlord.cdl.samples.Common@CreditAgency"
name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type Supplier"
name="Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <semanticAnnotations annotation=""
name="conversationType"/>
+ </participantTypes>
+ <channelTypes description="This is the channel type BrokerChannelType"
name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0"
roleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <channelTypes description="This is the channel type
CreditAgencyChannelType" name="CreditAgencyChannelType"
referenceToken="//@typeDefinitions/(a)tokens.0"
roleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <channelTypes description="This is the channel type SupplierChannelType"
name="SupplierChannelType"
referenceToken="//@typeDefinitions/(a)tokens.0"
roleType="//@typeDefinitions/(a)roleTypes.3"/>
+ </typeDefinitions>
+ <choreographies description="Choreography flow for the ESBBroker process"
name="ESBBrokerProcess" root="true">
+ <enclosedChoreographies name="CompleteTransaction">
+ <participantDefinitions name="SupplierTxnProcessor"
roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <semanticAnnotations
annotation="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor"
name="conversationType"/>
+ </participantDefinitions>
+ <variableDefinitions description="Channel to facilitate interaction to
Broker" name="BrokerChannel"
type="//@typeDefinitions/(a)channelTypes.0" free="true"
roleTypes="//@typeDefinitions/(a)roleTypes.0
//@typeDefinitions/(a)roleTypes.1"/>
+ <variableDefinitions description="Channel to facilitate interaction to
CreditAgency" name="CreditAgencyChannel"
type="//@typeDefinitions/(a)channelTypes.1"/>
+ <variableDefinitions description="Channel to facilitate interaction to
Supplier" name="SupplierChannel"
type="//@typeDefinitions/(a)channelTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy"
operation="buy"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction Buy" name="BuyRequestExchange"
type="//@typeDefinitions/(a)informationTypes.1"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="CheckCredit" operation="checkCredit"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1"
relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction CheckCredit"
name="CheckCreditRequestExchange"
type="//@typeDefinitions/(a)informationTypes.3"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice"
description="Evaluate Credit Check Result">
+ <activities xsi:type="org.pi4soa.cdl:Sequence"
description="Sufficient Credit">
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="CheckCreditResponse" operation="checkCredit"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1"
relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction CheckCreditResponse"
name="CheckCreditResponseRespondExchange"
type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="ConfirmBooking" operation="confirm"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2"
relationship="//@typeDefinitions/(a)relationshipTypes.1"
toParticipant="//@choreographies.0/@enclosedChoreographies.0/(a)participantDefinitions.0">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction ConfirmBooking"
name="ConfirmBookingRequestExchange"
type="//@typeDefinitions/(a)informationTypes.7"/>
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction ConfirmBooking"
name="ConfirmBookingRequestExchange"
type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="Buy" operation="buy"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction Buy" name="BuyRespondExchange"
type="//@typeDefinitions/(a)informationTypes.0" action="Respond"
faultName=""/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence"
description="Insufficient Credit">
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="CheckCreditFailed" operation="checkCredit"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1"
relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction CheckCreditFailed"
name="CheckCreditFailedRespondExchange"
type="//@typeDefinitions/(a)informationTypes.4" action="Respond"
faultName="invalidCredit"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="Buy" operation="buy"
channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction Buy" name="BuyRespondExchange"
type="//@typeDefinitions/(a)informationTypes.8" action="Respond"
faultName="rejected"/>
+ </activities>
+ </activities>
+ </activities>
+ </enclosedChoreographies>
+ <enclosedChoreographies name="RequestForQuote">
+ <participantDefinitions name="SupplierQuoteEngine"
roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <semanticAnnotations
annotation="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine"
name="conversationType"/>
+ </participantDefinitions>
+ <variableDefinitions description="Channel to facilitate interaction to
Supplier" name="SupplierChannel"
type="//@typeDefinitions/(a)channelTypes.2"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ"
operation="getQuote"
channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.1"
toParticipant="//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction RFQ" name="RFQRequestExchange"
type="//@typeDefinitions/(a)informationTypes.11"/>
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction RFQ" name="RFQRespondExchange"
type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/>
+ </activities>
+ </enclosedChoreographies>
+ <variableDefinitions description="Channel to facilitate interaction to
Broker" name="BrokerChannel"
type="//@typeDefinitions/(a)channelTypes.0"
roleTypes="//@typeDefinitions/(a)roleTypes.0
//@typeDefinitions/(a)roleTypes.1"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="Enquiry" operation="makeEnquiry"
channelVariable="//@choreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the request
exchange associated with interaction Enquiry" name="EnquiryRequestExchange"
type="//@typeDefinitions/(a)informationTypes.6"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:While"
name="SendRFQToSuppliers">
+ <activities xsi:type="org.pi4soa.cdl:Perform"
choreography="//@choreographies.0/(a)enclosedChoreographies.1"/>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:When"
name="WhenQuotesReceivedOrTimeout">
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="Enquiry" operation="makeEnquiry"
channelVariable="//@choreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
respond exchange associated with interaction Enquiry"
name="EnquiryRespondExchange"
type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice">
+ <activities xsi:type="org.pi4soa.cdl:Sequence">
+ <activities xsi:type="org.pi4soa.cdl:Perform"
choreography="//@choreographies.0/(a)enclosedChoreographies.0"
waitForCompletion="false">
+ <bindDetails name="BindBrokerChannel"
thisVariable="//@choreographies.0/(a)variableDefinitions.0"
thisRole="//@typeDefinitions/(a)roleTypes.1"
freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
freeRole="//@typeDefinitions/(a)roleTypes.1"/>
+ <bindDetails name="BindBrokerChannel"
thisVariable="//@choreographies.0/(a)variableDefinitions.0"
thisRole="//@typeDefinitions/(a)roleTypes.0"
freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0"
freeRole="//@typeDefinitions/(a)roleTypes.0"/>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Sequence">
+ <activities xsi:type="org.pi4soa.cdl:Interaction"
name="Cancel" operation="cancel"
channelVariable="//@choreographies.0/(a)variableDefinitions.0"
relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the
request exchange associated with interaction Cancel"
name="CancelRequestExchange"
type="//@typeDefinitions/(a)informationTypes.2"/>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Deleted:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBrokerProcess(a)Broker.scv
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBrokerProcess(a)Broker.scv 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/ESBBrokerProcess(a)Broker.scv 2009-04-22
22:18:00 UTC (rev 593)
@@ -1,46 +0,0 @@
-namespace org.pi4soa.esbbroker.esbbroker;
-
-conversation ESBBrokerProcess@Broker conforms to LoanBroker@Broker {
- role SupplierTxnProcessor, SupplierQuoteEngine, Buyer, CreditAgency;
-
- makeEnquiry(enquiry) from Buyer request "makeEnquiry";
-
- while @ Broker {
- run RequestForQuote@Broker;
- }
-
- when @ Broker {
- makeEnquiry(quoteList) to Buyer replyTo "makeEnquiry";
- }
-
- if @ Buyer {
- run CompleteTransaction@Broker;
- } else if {
- cancel(cancel) from Buyer;
- }
-
- conversation CompleteTransaction@Broker {
- role SupplierTxnProcessor, Buyer, CreditAgency;
-
- buy(buy) from Buyer request "buy";
-
- checkCredit(CreditCheckRequest) to CreditAgency request "checkCredit";
-
- if @ CreditAgency {
- checkCredit(CreditCheckOk) from CreditAgency replyTo "checkCredit";
- confirm(orderConfirmed) to SupplierTxnProcessor request "confirm";
- confirm(bookingReference) from SupplierTxnProcessor replyTo "confirm";
- buy(bookingReference) to Buyer replyTo "buy";
- } else if {
- checkCredit(CreditCheckInvalid) from CreditAgency replyTo "checkCredit";
- buy(orderRejected) to Buyer replyTo "buy";
- }
- }
-
- conversation RequestForQuote@Broker {
- role SupplierQuoteEngine;
-
- getQuote(requestForQuote) to SupplierQuoteEngine request "getQuote";
- getQuote(quote) from SupplierQuoteEngine replyTo "getQuote";
- }
-}
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoods.cdm
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoods.cdm
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoods.cdm 2009-04-22
22:18:00 UTC (rev 593)
@@ -0,0 +1,79 @@
+<?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>
Deleted:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoodsProcess(a)Store.scv
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoodsProcess(a)Store.scv 2009-04-22
21:10:53 UTC (rev 592)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/PurchaseGoodsProcess(a)Store.scv 2009-04-22
22:18:00 UTC (rev 593)
@@ -1,16 +0,0 @@
-namespace org.pi4soa.purchase.purchasegoods;
-
-conversation PurchaseGoodsProcess@Store {
- role Buyer, Store, CreditAgency;
- BuyRequest buy;
-
- buy(BuyRequest) from Buyer to Store request "buy";
- checkCredit(CreditCheckRequest) from Store to CreditAgency request
"checkCredit";
- if @ CreditAgency {
- checkCredit(CreditCheckOk) from CreditAgency to Store replyTo "checkCredit";
- buy(BuyConfirmed) from Store to Buyer replyTo "buy";
- } else if {
- checkCredit(CreditCheckInvalid) from CreditAgency to Store replyTo
"checkCredit";
- buy(BuyFailed) from Store to Buyer replyTo "buy";
- }
-}
\ No newline at end of file