Author: objectiser Date: 2008-10-21 05:39:03 -0400 (Tue, 21 Oct 2008) New Revision: 397 Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java Removed: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml Log: Updated supplier implementation and ESBBroker.cdm to use participant instances, to separate the lifecycle of the request for quote from the completion of the transaction. Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-10-21 08:58:59 UTC (rev 396) +++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2008-10-21 09:39:03 UTC (rev 397) @@ -26,7 +26,7 @@ import org.apache.log4j.Logger; import org.jboss.soa.overlord.jbossesb.actions.Service; -@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="jboss.overlord.samples.LoanBroker@Broker", root=true) +@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="overlord.cdl.samples.LoanBroker@Broker", root=true) public class BrokerMain implements Serializable, QuoteManager{ private static final long serialVersionUID = 11114L; Modified: cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-10-21 08:58:59 UTC (rev 396) +++ cdl/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2008-10-21 09:39:03 UTC (rev 397) @@ -42,7 +42,7 @@ <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/> </participantTypes> <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.3&quot;&gt; - <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Supplier" name="conversationType"/> + <semanticAnnotations annotation="" name="conversationType"/> </participantTypes> <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; @@ -50,6 +50,9 @@ </typeDefinitions> <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true"> <enclosedChoreographies name="CompleteTransaction"> + <participantDefinitions name="SupplierTxnProcessor" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.3&quot;&gt; + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="conversationType"/> + </participantDefinitions> <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; @@ -64,7 +67,7 @@ <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; + <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; toParticipant=&quot;//@choreographies.0/@enclosedChoreographies.0/(a)participantDefinitions.0&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> @@ -83,8 +86,11 @@ </activities> </enclosedChoreographies> <enclosedChoreographies name="RequestForQuote"> + <participantDefinitions name="SupplierQuoteEngine" roleTypes=&quot;//@typeDefinitions/(a)roleTypes.3&quot;&gt; + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="conversationType"/> + </participantDefinitions> <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; + <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; toParticipant=&quot;//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0&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> Deleted: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java 2008-10-21 08:58:59 UTC (rev 396) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierMain.java 2008-10-21 09:39:03 UTC (rev 397) @@ -1,28 +0,0 @@ -package org.jboss.soa.overlord.samples.jbossesb.supplier; - -import java.io.Serializable; - -import org.jboss.soa.overlord.jbossesb.actions.Service; - -/** - * @author jeffyu - * - */ -@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.supplier@Supplier", root=true) - -public class SupplierMain implements Serializable { - - private static final long serialVersionUID = -3956749311779109550L; - - private long id; - - public long getId() { - return this.id; - } - - - public void setId(long id) { - this.id = id; - } - -} Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java (rev 0) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java 2008-10-21 09:39:03 UTC (rev 397) @@ -0,0 +1,28 @@ +package org.jboss.soa.overlord.samples.jbossesb.supplier; + +import java.io.Serializable; + +import org.jboss.soa.overlord.jbossesb.actions.Service; + +/** + * @author jeffyu + * + */ +@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine", root=true) + +public class SupplierRFQMain implements Serializable { + + private static final long serialVersionUID = -3956749311779109550L; + + private long id; + + public long getId() { + return this.id; + } + + + public void setId(long id) { + this.id = id; + } + +} Added: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java (rev 0) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java 2008-10-21 09:39:03 UTC (rev 397) @@ -0,0 +1,28 @@ +package org.jboss.soa.overlord.samples.jbossesb.supplier; + +import java.io.Serializable; + +import org.jboss.soa.overlord.jbossesb.actions.Service; + +/** + * @author jeffyu + * + */ +@Service(name="{http://www.jboss.org/overlord/loanBroker}Supplier1", conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor", root=true) + +public class SupplierTxnMain implements Serializable { + + private static final long serialVersionUID = -3956749311779109550L; + + private long id; + + public long getId() { + return this.id; + } + + + public void setId(long id) { + this.id = id; + } + +} Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml =================================================================== --- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2008-10-21 08:58:59 UTC (rev 396) +++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2008-10-21 09:39:03 UTC (rev 397) @@ -64,7 +64,7 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" process="process" name="su11-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" /> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierRFQMain" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="su11-2"> @@ -102,7 +102,7 @@ <actions mep="OneWay"> <action class="org.jboss.soa.overlord.jbossesb.actions.CreateSessionAction" process="process" name="su12-1"> - <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierMain" /> + <property name="session" value="org.jboss.soa.overlord.samples.jbossesb.supplier.SupplierTxnMain" /> </action> <action class="org.jboss.soa.overlord.jbossesb.actions.ReceiveMessageAction" process="process" name="su12-2">