Author: jeff.yuchang Date: 2008-07-22 14:06:55 -0400 (Tue, 22 Jul 2008) New Revision: 195 Modified: cdl/trunk/samples/jbossesb/README.txt cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/SetCreditCheckResponseMessageAction.java cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml cdl/trunk/samples/pom.xml Log: * Update the cdm model file, use 'buy' instead of 'purchaseDetail'. * Update the actions to use correct message type as defined in the cdl model file. Modified: cdl/trunk/samples/jbossesb/README.txt =================================================================== --- cdl/trunk/samples/jbossesb/README.txt 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/README.txt 2008-07-22 18:06:55 UTC (rev 195) @@ -76,8 +76,9 @@ [java] Reply: <quoteList id="20"><quote supplierDesc="{http://www.jboss.org/overlord/loanBroker}Supplier1&qu... [java] Sending Buy request to Broker... [java] Request: <buy id="20" supplierDesc="{http://www.jboss.org/overlord/loanBroker}Supplier1" quoteValue="10"></buy> - [java] Reply: <orderConfirmResponse id="20" supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1">The quote of 10 has been confirmed.</orderConfirmResponse> + [java] Reply: <bookingReference id="20" supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1">The quote of 10 has been confirmed.</bookingReference> [java] ========================================= + 6 - you can be from the $broker to run "ant dbmanager" to open up the database browser to check the data. Modified: cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm =================================================================== --- cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/models/ESBBroker.cdm 2008-07-22 18:06:55 UTC (rev 195) @@ -1,112 +1,112 @@ -<?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 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 PurchaseDetails" name="PurchaseDetails" elementName="purchaseDetails"/> - <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=&quot;//@typeDefinitions/(a)informationTypes.12&quot;/&gt; - <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=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; - <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.3&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.LoanBroker@Broker" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.1&quot;/&gt; - <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 Supplier" name="Supplier" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.3&quot;/&gt; - <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot;/&gt; - <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; - <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.3&quot;/&gt; - </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=&quot;//@typeDefinitions/(a)channelTypes.0&quot; free="true" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1&quot;/&gt; - <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; - <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type=&quot;//@typeDefinitions/(a)channelTypes.2&quot;/&gt; - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.8&quot;/&gt; - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCredit" name="CheckCreditRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot;/&gt; - </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=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCreditResponse" name="CheckCreditResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.4&quot; action="Respond"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.6&quot;/&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; action="Respond"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.6&quot; 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=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCreditFailed" name="CheckCreditFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.3&quot; action="Respond" faultName="invalidCredit"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.7&quot; action="Respond" faultName="rejected"/> - </activities> - </activities> - </activities> - </enclosedChoreographies> - <enclosedChoreographies name="RequestForQuote"> - <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type=&quot;//@typeDefinitions/(a)channelTypes.2&quot;/&gt; - <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.1/(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 RFQ" name="RFQRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.11&quot;/&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.9&quot; action="Respond"/> - </activities> - </enclosedChoreographies> - <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type=&quot;//@typeDefinitions/(a)channelTypes.0&quot; roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1&quot;/&gt; - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.5&quot;/&gt; - </activities> - <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers"> - <activities xsi:type="org.pi4soa.cdl:Perform" choreography=&quot;//@choreographies.0/(a)enclosedChoreographies.1&quot; waitForCompletion="false"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.10&quot; 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=&quot;//@choreographies.0/(a)enclosedChoreographies.0&quot;&gt; - <bindDetails name="BindBrokerChannel" thisVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; thisRole=&quot;//@typeDefinitions/(a)roleTypes.1&quot; freeVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; freeRole=&quot;//@typeDefinitions/(a)roleTypes.1&quot;/&gt; - <bindDetails name="BindBrokerChannel" thisVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; thisRole=&quot;//@typeDefinitions/(a)roleTypes.0&quot; freeVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; freeRole=&quot;//@typeDefinitions/(a)roleTypes.0&quot;/&gt; - </activities> - </activities> - <activities xsi:type="org.pi4soa.cdl:Sequence"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.1&quot;/&gt; - </activities> - </activities> - </activities> - </choreographies> -</org.pi4soa.cdl:Package> +<?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=&quot;//@typeDefinitions/(a)informationTypes.12&quot;/&gt; + <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=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; + <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot; secondRoleType=&quot;//@typeDefinitions/(a)roleTypes.3&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.LoanBroker@Broker" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.1&quot;/&gt; + <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 Supplier" name="Supplier" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.3&quot;/&gt; + <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.0&quot;/&gt; + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.2&quot;/&gt; + <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken=&quot;//@typeDefinitions/(a)tokens.0&quot; roleType=&quot;//@typeDefinitions/(a)roleTypes.3&quot;/&gt; + </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=&quot;//@typeDefinitions/(a)channelTypes.0&quot; free="true" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1&quot;/&gt; + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type=&quot;//@typeDefinitions/(a)channelTypes.2&quot;/&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.1&quot;/&gt; + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCredit" name="CheckCreditRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.3&quot;/&gt; + </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=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCreditResponse" name="CheckCreditResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.5&quot; action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.7&quot;/&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; 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=&quot;//@choreographies.0/@enclosedChoreographies.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 CheckCreditFailed" name="CheckCreditFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.4&quot; action="Respond" faultName="invalidCredit"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.8&quot; action="Respond" faultName="rejected"/> + </activities> + </activities> + </activities> + </enclosedChoreographies> + <enclosedChoreographies name="RequestForQuote"> + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type=&quot;//@typeDefinitions/(a)channelTypes.2&quot;/&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable=&quot;//@choreographies.0/@enclosedChoreographies.1/(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 RFQ" name="RFQRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.11&quot;/&gt; + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.9&quot; action="Respond"/> + </activities> + </enclosedChoreographies> + <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type=&quot;//@typeDefinitions/(a)channelTypes.0&quot; roleTypes=&quot;//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1&quot;/&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.6&quot;/&gt; + </activities> + <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography=&quot;//@choreographies.0/(a)enclosedChoreographies.1&quot; waitForCompletion="false"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.10&quot; 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=&quot;//@choreographies.0/(a)enclosedChoreographies.0&quot;&gt; + <bindDetails name="BindBrokerChannel" thisVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; thisRole=&quot;//@typeDefinitions/(a)roleTypes.1&quot; freeVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; freeRole=&quot;//@typeDefinitions/(a)roleTypes.1&quot;/&gt; + <bindDetails name="BindBrokerChannel" thisVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; thisRole=&quot;//@typeDefinitions/(a)roleTypes.0&quot; freeVariable=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0&quot; freeRole=&quot;//@typeDefinitions/(a)roleTypes.0&quot;/&gt; + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.2&quot;&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot;/&gt; + </activities> + </activities> + </activities> + </choreographies> +</org.pi4soa.cdl:Package> Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2008-07-22 18:06:55 UTC (rev 195) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<CreditCheckRequest id=\"" + idValue +"\"></CreditCheckRequest>"); + message.getBody().add("<creditInformation id=\"" + idValue +"\"></creditInformation>"); logger.info("Updated credit check request message: "+message.getBody().get()); Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2008-07-22 18:06:55 UTC (rev 195) @@ -46,10 +46,10 @@ String supplier = (String) message.getProperties().getProperty("supplierDesc"); String quoteValue = (String)message.getProperties().getProperty("quoteValue"); - message.getBody().add("<orderConfirmRequest id=\"" + idValue +"\" supplierDesc=\"" - + supplier+"\" quoteValue=\"" + quoteValue + "\"></orderConfirmRequest>"); + message.getBody().add("<orderConfirmed id=\"" + idValue +"\" supplierDesc=\"" + + supplier+"\" quoteValue=\"" + quoteValue + "\"></orderConfirmed>"); - logger.info("Set 'orderConfirmRequest' : " + message.getBody().get()); + logger.info(message.getBody().get()); return message; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/SetCreditCheckResponseMessageAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/SetCreditCheckResponseMessageAction.java 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/creditAgency/SetCreditCheckResponseMessageAction.java 2008-07-22 18:06:55 UTC (rev 195) @@ -40,7 +40,7 @@ Node node = XMLUtils.getNode((String)message.getBody().get()); String idValue = node.getAttributes().getNamedItem("id").getNodeValue(); - message.getBody().add("<CreditCheckResponse id=\"" + idValue +"\"></CreditCheckResponse>"); + message.getBody().add("<creditValid id=\"" + idValue +"\"></creditValid>"); logger.info("Updated credit message: "+message); Modified: cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/supplier/SetOrderConfirmResponseAction.java 2008-07-22 18:06:55 UTC (rev 195) @@ -49,12 +49,12 @@ String supplierDesc = "{http://www.jboss.org/overlord/loanBroker}Supplier1"; String confirmation = "The quote of " + quoteValue + " has been confirmed."; - String body = "<orderConfirmResponse id=\"" + idValue + "\" supplierDesc = \"" - + supplierDesc+ "\">"+confirmation +"</orderConfirmResponse>"; + String body = "<bookingReference id=\"" + idValue + "\" supplierDesc = \"" + + supplierDesc+ "\">"+confirmation +"</bookingReference>"; message.getBody().add(body); - logger.info("set 'orderConfirmResponse' of [" + body + "]"); + logger.info("set 'bookingReference' of [" + body + "]"); return message; } Modified: cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/jbossesb/broker/src/main/resources/META-INF/jboss-esb.xml 2008-07-22 18:06:55 UTC (rev 195) @@ -337,7 +337,7 @@ process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.BrokerMain" /> <property name="operation" value="confirm" /> - <property name="messageType" value="orderConfirmResponse" /> + <property name="messageType" value="bookingReference" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -484,7 +484,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="s10-4"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditCheckRequest" /> + <property name="messageType" value="creditInformation" /> <property name="serviceName" value="CreditAgency.Main" /> <property name="serviceCategory" value="ESBBroker.CreditAgency" /> <property name="responseServiceName" value="CompleteTransaction.main.1" /> @@ -520,7 +520,7 @@ <property name="paths"> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.2" > - <message type="CreditCheckResponse" /> + <message type="creditValid" /> </case> <case service-category="ESBBroker.BrokerParticipant" service-name="CompleteTransaction.main.4" > @@ -542,7 +542,7 @@ process="process" name="s12-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditCheckResponse" /> + <property name="messageType" value="creditValid" /> <property name="identities" > <identity type="primary" > <token name="id" locator="//@id" /> @@ -569,7 +569,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="s12-5"> <property name="operation" value="confirm" /> - <property name="messageType" value="orderConfirmRequest" /> + <property name="messageType" value="orderConfirmed" /> <property name="serviceNameExpression" value="supplier.serviceName" /> <property name="serviceCategoryExpression" value="supplier.serviceCategory" /> <property name="responseServiceName" value="CompleteTransaction.main.3" /> @@ -594,7 +594,7 @@ process="process" name="s13-1"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.broker.CompleteTransactionMain" /> <property name="operation" value="confirm" /> - <property name="messageType" value="orderConfirmResponse" /> + <property name="messageType" value="bookingReference" /> <property name="serviceDescriptionName" value="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction... /> <property name="identities" > <identity type="primary" > @@ -606,13 +606,13 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.SetStateAction" process="process" name="s13-2"> <property name="variable" value="confirmation.detail" /> - <property name="messageExpression" value="/orderConfirmResponse" /> + <property name="messageExpression" value="/bookingReference" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="s13-3"> <property name="operation" value="buy" /> - <property name="messageType" value="orderConfirmResponse" /> + <property name="messageType" value="bookingReference" /> <property name="clientEPR" value="buyer" /> <property name="identities" > <identity type="primary" > @@ -682,7 +682,7 @@ <token name="id" locator="//@id" /> <token name="supplierDesc" locator="//@supplierDesc" /> </identity> - <message type="orderConfirmRequest" /> + <message type="orderConfirmed" /> </route> </property> </action> @@ -740,7 +740,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="su12-2"> - <property name="messageType" value="orderConfirmRequest" /> + <property name="messageType" value="orderConfirmed" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > @@ -753,7 +753,7 @@ </action> <action class="org.jboss.soa.overlord.jbossesb.actions.SendMessageAction" process="process" name="su12-4"> - <property name="messageType" value="orderConfirmResponse" /> + <property name="messageType" value="bookingReference" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > @@ -779,7 +779,7 @@ <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="c2"> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditCheckRequest" /> + <property name="messageType" value="creditInformation" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > @@ -816,7 +816,7 @@ process="process" name="d3"> <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.loan.creditAgency.CreditAgency" /> <property name="operation" value="checkCredit" /> - <property name="messageType" value="CreditCheckResponse" /> + <property name="messageType" value="creditValid" /> <property name="clientEPR" value="broker" /> <property name="identities" > <identity type="primary" > Modified: cdl/trunk/samples/pom.xml =================================================================== --- cdl/trunk/samples/pom.xml 2008-07-22 06:43:40 UTC (rev 194) +++ cdl/trunk/samples/pom.xml 2008-07-22 18:06:55 UTC (rev 195) @@ -20,7 +20,6 @@ <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations> <hibernate-tools-version>3.2.0.ga</hibernate-tools-version> <hsqldb-version>1.8.0.7</hsqldb-version> - </properties>