[overlord-commits] Overlord SVN: r306 - in cdl/trunk/samples/jbossesb/purchasing: store/src/main/java/com/acme/services/broker and 1 other directory.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Wed Sep 3 07:48:17 EDT 2008


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="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.4" query="//@id" name="CreditCheckInvalidIDLocator"/>
     <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.3" query="//@id" name="CreditCheckRequestIDLocator"/>
     <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.5" 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="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
-    <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/@roleTypes.1" secondRoleType="//@typeDefinitions/@roleTypes.0"/>
-    <participantTypes description="This is the participant type Broker" name="Broker" roleTypes="//@typeDefinitions/@roleTypes.0">
-      <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at Broker" name="conversationType"/>
-    </participantTypes>
-    <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
+    <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/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
+    <relationshipTypes description="Relationship between Store and CreditAgency" name="StoreToCreditAgencyRel" firstRoleType="//@typeDefinitions/@roleTypes.2" secondRoleType="//@typeDefinitions/@roleTypes.1"/>
+    <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.0">
       <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at Buyer" name="conversationType"/>
     </participantTypes>
-    <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
+    <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
       <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at CreditAgency" name="conversationType"/>
     </participantTypes>
-    <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.0">
+    <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/@roleTypes.2">
+      <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at Store" name="conversationType"/>
+    </participantTypes>
+    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.1">
       <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
     </channelTypes>
-    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.2">
+    <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.2">
       <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
     </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="//@typeDefinitions/@channelTypes.0"/>
-    <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
-    <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+    <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.0"/>
+    <variableDefinitions description="Channel to facilitate interaction to Store" name="StoreChannel" type="//@typeDefinitions/@channelTypes.1"/>
+    <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
       <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
     </activities>
-    <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+    <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
       <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheckRequest" name="CreditCheckRequestRequestExchange" type="//@typeDefinitions/@informationTypes.3"/>
     </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="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+        <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckResponse" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
           <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckResponse" name="CreditCheckResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
         </activities>
-        <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+        <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
           <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyResponse" name="BuyResponseRespondExchange" type="//@typeDefinitions/@informationTypes.2" action="Respond"/>
         </activities>
       </activities>
       <activities xsi:type="org.pi4soa.cdl:Sequence">
-        <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+        <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
           <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="CreditCheckFailed"/>
         </activities>
-        <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+        <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
           <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/@informationTypes.0" 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;
 
- at Service(name="{http://www.jboss.org/overlord/purchase}Broker", conversationType="overlord.cdl.samples.purchasing at Broker", root=true)
+ at Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.purchasing at Store", root=true)
 public class PurchaseGoods implements Serializable{
 	
 	private long id;




More information about the overlord-commits mailing list