[overlord-commits] Overlord SVN: r321 - in cdl/trunk: samples/jbossesb and 5 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Wed Sep 10 12:17:21 EDT 2008


Author: objectiser
Date: 2008-09-10 12:17:21 -0400 (Wed, 10 Sep 2008)
New Revision: 321

Added:
   cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
   cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
   cdl/trunk/samples/jbossesb/SamplesGuide.odt
   cdl/trunk/samples/jbossesb/SamplesGuide.pdf
Modified:
   cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
   cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
   cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
   cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java
   cdl/trunk/samples/jbossesb/trailblazer/readme.txt
Log:
Made the conversationType annotation consistent between the choreography descriptions and the Service annotations in the examples. Created a SamplesGuide to explain how to install/configure/use the examples. Moved the enhanced trailblazer guide into the docs folder.

Added: cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
===================================================================
(Binary files differ)


Property changes on: cdl/trunk/docs/cdl/user/TrailblazerGuide.odt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
===================================================================
(Binary files differ)


Property changes on: cdl/trunk/docs/cdl/user/TrailblazerGuide.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: cdl/trunk/samples/jbossesb/SamplesGuide.odt
===================================================================
(Binary files differ)


Property changes on: cdl/trunk/samples/jbossesb/SamplesGuide.odt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: cdl/trunk/samples/jbossesb/SamplesGuide.pdf
===================================================================
(Binary files differ)


Property changes on: cdl/trunk/samples/jbossesb/SamplesGuide.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm	2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm	2008-09-10 16:17:21 UTC (rev 321)
@@ -1,112 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for 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="creditInformation"/>
-    <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="creditInvalid"/>
-    <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="creditValid"/>
-    <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/@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/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
-    <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.3"/>
-    <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.LoanBroker at Broker" name="conversationType"/>
-    </participantTypes>
-    <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1"/>
-    <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2"/>
-    <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/@roleTypes.3"/>
-    <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.0"/>
-    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.2"/>
-    <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.3"/>
-  </typeDefinitions>
-  <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
-    <enclosedChoreographies name="CompleteTransaction">
-      <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" free="true" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
-      <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
-      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
-      </activities>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.2" relationship="//@typeDefinitions/@relationshipTypes.1">
-            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.7"/>
-            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="invalidCredit"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@informationTypes.8" action="Respond" faultName="rejected"/>
-          </activities>
-        </activities>
-      </activities>
-    </enclosedChoreographies>
-    <enclosedChoreographies name="RequestForQuote">
-      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/@informationTypes.11"/>
-        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/@informationTypes.9" action="Respond"/>
-      </activities>
-    </enclosedChoreographies>
-    <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
-    <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-      <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/@informationTypes.6"/>
-    </activities>
-    <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
-      <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/@enclosedChoreographies.1" waitForCompletion="false"/>
-    </activities>
-    <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout">
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/@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/@enclosedChoreographies.0">
-          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@roleTypes.1"/>
-          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-          <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/@informationTypes.2"/>
-        </activities>
-      </activities>
-    </activities>
-  </choreographies>
-</org.pi4soa.cdl:Package>
+<?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="creditInformation"/>
+    <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="creditInvalid"/>
+    <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="creditValid"/>
+    <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/@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/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
+    <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.3"/>
+    <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="overlord.cdl.samples.LoanBroker at Broker" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
+      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Buyer" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
+      <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
+      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Supplier" name="conversationType"/>
+    </participantTypes>
+    <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.0"/>
+    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.2"/>
+    <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.3"/>
+  </typeDefinitions>
+  <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
+    <enclosedChoreographies name="CompleteTransaction">
+      <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" free="true" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
+      <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
+      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
+      </activities>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.2" relationship="//@typeDefinitions/@relationshipTypes.1">
+            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.7"/>
+            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="invalidCredit"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@informationTypes.8" action="Respond" faultName="rejected"/>
+          </activities>
+        </activities>
+      </activities>
+    </enclosedChoreographies>
+    <enclosedChoreographies name="RequestForQuote">
+      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/@informationTypes.11"/>
+        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/@informationTypes.9" action="Respond"/>
+      </activities>
+    </enclosedChoreographies>
+    <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
+    <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+      <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/@informationTypes.6"/>
+    </activities>
+    <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
+      <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/@enclosedChoreographies.1" waitForCompletion="false"/>
+    </activities>
+    <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout">
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/@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/@enclosedChoreographies.0">
+          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@roleTypes.1"/>
+          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+          <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/@informationTypes.2"/>
+        </activities>
+      </activities>
+    </activities>
+  </choreographies>
+</org.pi4soa.cdl:Package>

Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java	2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java	2008-09-10 16:17:21 UTC (rev 321)
@@ -23,7 +23,7 @@
 
 import org.jboss.soa.overlord.jbossesb.actions.Service;
 
- at Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.purchasing at CreditAgency",root=true)
+ at Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.Common at CreditAgency",root=true)
 public class CreditAgencyPurchase implements Serializable {
 	
 	private long id;

Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm	2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm	2008-09-10 16:17:21 UTC (rev 321)
@@ -31,13 +31,13 @@
     <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"/>
+      <semanticAnnotations annotation="overlord.cdl.samples.Purchasing at Buyer" name="conversationType"/>
     </participantTypes>
     <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
-      <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at CreditAgency" name="conversationType"/>
+      <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
     </participantTypes>
     <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/@roleTypes.2">
-      <semanticAnnotations annotation="jboss.overlord.samples.Purchasing at Store" name="conversationType"/>
+      <semanticAnnotations annotation="overlord.cdl.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"/>

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-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java	2008-09-10 16:17:21 UTC (rev 321)
@@ -23,7 +23,7 @@
 
 import org.jboss.soa.overlord.jbossesb.actions.Service;
 
- at Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.purchasing at Store", 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;

Modified: cdl/trunk/samples/jbossesb/trailblazer/readme.txt
===================================================================
--- cdl/trunk/samples/jbossesb/trailblazer/readme.txt	2008-09-10 10:33:15 UTC (rev 320)
+++ cdl/trunk/samples/jbossesb/trailblazer/readme.txt	2008-09-10 16:17:21 UTC (rev 321)
@@ -7,6 +7,7 @@
 - A mail server to send email notifications
 - JBoss AS 4.2.1 or higher with EJB3 and JBossWS support.  You can install the latest JBoss AS JEMS installer and select the "EJB3" install config to get the right one installed.
 - JBoss AS 4.2.1 or higher with the JBoss ESB SAR deployment (jbossesb.sar). 
+- JBossESB 4.3 or higher
 
 Settings required to edit before running:
 
@@ -14,7 +15,7 @@
 - Update the section titled "transports" and specify all of the SMTP mail server settings for your environment.
 
 File : deployment.properties (install/deployment.properties)
-- Update the app server location settings.
+- Update the JBossAS and JBossESB location settings.
 
 File : trailblazer.properties (TB_ROOT/trailblazer.properties)
 - Update the file.bank.monitored.directory and file.output.directory properties' value properly. 




More information about the overlord-commits mailing list