Author: objectiser Date: 2008-09-03 07:48:17 -0400 (Wed, 03 Sep 2008) New Revision: 306 Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java Log: Changed choreography to use 'Store' participant, and updated the associated conversation type against the participant and the Java 'session' class for that participant. Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-03 11:28:37 UTC (rev 305) +++ cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-03 11:48:17 UTC (rev 306) @@ -19,56 +19,56 @@ <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.4&quot; query="//@id" name="CreditCheckInvalidIDLocator"/> <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.3&quot; query="//@id" name="CreditCheckRequestIDLocator"/> <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.5&quot; query="//@id" name="CreditCheckResponseIDLocator"/> - <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> - <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; - <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType=&quot;//@typeDefinitions/(a)roleTypes.1&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot;/&gt; - <participantTypes description="This is the participant type Broker" name="Broker" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0&quot;&gt; - <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@Broker" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.1&quot;&gt; + <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=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; + <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.1&quot;/&gt; + <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0&quot;&gt; <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@Buyer" name="conversationType"/> </participantTypes> - <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.2&quot;&gt; + <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.1&quot;&gt; <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@CreditAgency" name="conversationType"/> </participantTypes> - <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.1&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot;&gt; + <participantTypes description="This is the participant type Store" name="Store" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.2&quot;&gt; + <semanticAnnotations annotation="jboss.overlord.samples.Purchasing@Store" name="conversationType"/> + </participantTypes> + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.1&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.1&quot;&gt; <identities description="ID" tokens=&quot;//@typeDefinitions/(a)tokens.0&quot;/&gt; </channelTypes> - <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.1&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;&gt; + <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.1&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;&gt; <identities description="ID" tokens=&quot;//@typeDefinitions/(a)tokens.0&quot;/&gt; </channelTypes> </typeDefinitions> <choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true"> - <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type=&quot;//@typeDefinitions/(a)channelTypes.0&quot;/&gt; - <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type=&quot;//@typeDefinitions/(a)channelTypes.0&quot;/&gt; + <variableDefinitions description="Channel to facilitate interaction to Store" name="StoreChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.1&quot;/&gt; </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheckRequest" name="CreditCheckRequestRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.3&quot;/&gt; </activities> <activities xsi:type="org.pi4soa.cdl:Choice"> <activities xsi:type="org.pi4soa.cdl:Sequence"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckResponse" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckResponse" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckResponse" name="CreditCheckResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.5&quot; action="Respond"/> </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyResponse" name="BuyResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot; action="Respond"/> </activities> </activities> <activities xsi:type="org.pi4soa.cdl:Sequence"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.4&quot; action="Respond" faultName="CreditCheckFailed"/> </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; action="Respond" faultName="BuyFailed"/> </activities> </activities> Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java =================================================================== --- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-09-03 11:28:37 UTC (rev 305) +++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2008-09-03 11:48:17 UTC (rev 306) @@ -23,7 +23,7 @@ import org.jboss.soa.overlord.jbossesb.actions.Service; -@Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="overlord.cdl.samples.purchasing@Broker", root=true) +@Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.purchasing@Store", root=true) public class PurchaseGoods implements Serializable{ private long id;