[savara-commits] savara SVN: r95 - in runtime/trunk/samples/jbossesb: brokerage/models and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Nov 30 10:45:25 EST 2009
Author: objectiser
Date: 2009-11-30 10:45:25 -0500 (Mon, 30 Nov 2009)
New Revision: 95
Modified:
runtime/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
runtime/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
runtime/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
runtime/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
runtime/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml
runtime/trunk/samples/jbossesb/purchasing/models/BuyRequest.xml
runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckInvalid.xml
runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml
runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckRequest.xml
runtime/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn
runtime/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
runtime/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn
runtime/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
Log:
SAVARA-7 - added namespace to messages and models. Need to update runtime tests. Also appears that generation of ESBBroker.cdm Broker participant is not complete - need to raise bug.
Modified: runtime/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- runtime/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/brokerage/broker/src/main/resources/META-INF/jboss-esb.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -56,16 +56,16 @@
<property name="conversationType" value="savara.samples.LoanBroker at Broker"/>
<property name="paths">
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__1">
- <message type="enquiry"/>
+ <message type="{http://www.jboss.org/examples/broker}enquiry"/>
</case>
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__7">
<event description="Event trigger to send quoteList message type(s)"/>
</case>
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__8">
- <message type="buy"/>
+ <message type="{http://www.jboss.org/examples/broker}buy"/>
</case>
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__12">
- <message type="cancel"/>
+ <message type="{http://www.jboss.org/examples/broker}cancel"/>
</case>
</property>
</action>
@@ -78,7 +78,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__1_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
- <property name="messageType" value="enquiry"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/broker}enquiry"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
@@ -101,7 +101,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__2_action_1" process="process">
<property name="operation" value="getQuote"/>
- <property name="messageType" value="requestForQuote"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}requestForQuote"/>
<property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
@@ -125,7 +125,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__4_action_1" process="process">
<property name="operation" value="getQuote"/>
- <property name="messageType" value="quote"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}quote"/>
</action>
<action class="org.jboss.savara.examples.broker.SetQuoteAction" name="b-2" process="process">
</action>
@@ -145,7 +145,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__5_action_1" process="process">
<property name="operation" value="getQuote"/>
- <property name="messageType" value="requestForQuote"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}requestForQuote"/>
<property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierQuoteEngine"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
@@ -171,7 +171,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__7_action_1" process="process">
<property name="operation" value="makeEnquiry"/>
- <property name="messageType" value="quoteList"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/broker}quoteList"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
@@ -184,7 +184,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__8_action_1" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="buy"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/broker}buy"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
@@ -192,7 +192,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__8_action_2" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckRequest"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest"/>
<property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
<property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
@@ -207,13 +207,13 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__9_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckOk"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckOk"/>
</action>
<action name="set-orderConfirm" class="org.jboss.savara.examples.broker.SetOrderConfirmRequestAction">
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__9_action_2" process="process">
<property name="operation" value="confirm"/>
- <property name="messageType" value="orderConfirmed"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}orderConfirmed"/>
<property name="serviceCategory" value="org.jboss.savara.examples.esbbroker"/>
<property name="serviceName" value="ESBBrokerProcess_SupplierTxnProcessor"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.esbbroker"/>
@@ -228,11 +228,11 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__10_action_1" process="process">
<property name="operation" value="confirm"/>
- <property name="messageType" value="bookingReference"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}bookingReference"/>
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__10_action_2" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="bookingReference"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}bookingReference"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
@@ -245,14 +245,14 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__11_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckInvalid"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid"/>
</action>
<action name="set-orderRejected" class="org.jboss.savara.examples.broker.SetOrderRejectMessageAction"></action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_Broker__11_action_2" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="orderRejected"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/broker}orderRejected"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.broker.MemoryEPRStorage" />
</action>
@@ -265,7 +265,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_Broker__12_action_1" process="process">
<property name="operation" value="cancel"/>
- <property name="messageType" value="cancel"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/broker}cancel"/>
</action>
</actions>
</service>
@@ -277,10 +277,10 @@
<action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="checkCredit_action_1" process="process">
<property name="paths">
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__9">
- <message type="CreditCheckOk"/>
+ <message type="{http://www.jboss.org/examples/creditAgency}CreditCheckOk"/>
</case>
<case service-category="org.jboss.savara.examples.esbbroker" service-name="ESBBrokerProcess_Broker__11">
- <message type="CreditCheckInvalid"/>
+ <message type="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid"/>
</case>
</property>
</action>
Modified: runtime/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm
===================================================================
--- runtime/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/brokerage/models/ESBBroker.cdm 2009-11-30 15:45:25 UTC (rev 95)
@@ -1,124 +1,127 @@
-<?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.3" targetNamespace="http://www.jboss.org/savara/examples">
- <typeDefinitions>
- <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
- <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="CreditCheckRequest"/>
- <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="CreditCheckInvalid"/>
- <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="CreditCheckOk"/>
- <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="savara.samples.LoanBroker at Broker" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
- <semanticAnnotations annotation="savara.samples.LoanBroker at Buyer" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
- <semanticAnnotations annotation="savara.samples.Common at CreditAgency" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type Supplier" name="Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
- <semanticAnnotations annotation="" 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">
- <participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/@roleTypes.3">
- <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
- </participantDefinitions>
- <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" toParticipant="//@choreographies.0/@enclosedChoreographies.0/@participantDefinitions.0">
- <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">
- <participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/@roleTypes.3">
- <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
- </participantDefinitions>
- <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" toParticipant="//@choreographies.0/@enclosedChoreographies.1/@participantDefinitions.0">
- <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"/>
- </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="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.3" targetNamespace="http://www.jboss.org/savara/examples">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
+ <nameSpaces prefix="bro" uRI="http://www.jboss.org/examples/broker"/>
+ <nameSpaces prefix="sup" uRI="http://www.jboss.org/examples/supplier"/>
+ <nameSpaces prefix="ca" uRI="http://www.jboss.org/examples/creditAgency"/>
+ <informationTypes description="This is the information type BookingReference" name="BookingReference" typeName="sup:bookingReference" elementName=""/>
+ <informationTypes description="This is the information type Buy" name="Buy" typeName="bro:buy" elementName=""/>
+ <informationTypes description="This is the information type Cancel" name="Cancel" typeName="bro:cancel" elementName=""/>
+ <informationTypes description="This is the information type CreditInformation" name="CreditInformation" typeName="ca:CreditCheckRequest" elementName=""/>
+ <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" typeName="ca:CreditCheckInvalid" elementName=""/>
+ <informationTypes description="This is the information type CreditValid" name="CreditValid" typeName="ca:CreditCheckOk" elementName=""/>
+ <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="bro:enquiry" elementName=""/>
+ <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" typeName="sup:orderConfirmed" elementName=""/>
+ <informationTypes description="This is the information type OrderRejected" name="OrderRejected" typeName="bro:orderRejected" elementName=""/>
+ <informationTypes description="This is the information type Quote" name="Quote" typeName="sup:quote" elementName=""/>
+ <informationTypes description="This is the information type QuoteList" name="QuoteList" typeName="bro:quoteList" elementName=""/>
+ <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" typeName="sup:requestForQuote" elementName=""/>
+ <informationTypes description="This is the information type URIType" name="URIType" typeName="xsd:anyURI"/>
+ <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" interface="bro:BrokerInterface"/>
+ </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" interface="ca:CreditAgencyInterface"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Supplier" name="Supplier">
+ <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior" interface="sup:SupplierInterface"/>
+ </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 Buyer" name="Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
+ <semanticAnnotations annotation="savara.samples.LoanBroker at Buyer" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type bro:Broker" name="bro:Broker" roleTypes="//@typeDefinitions/@roleTypes.0">
+ <semanticAnnotations annotation="savara.samples.LoanBroker at Broker" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type ca:CreditAgency" name="ca:CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
+ <semanticAnnotations annotation="savara.samples.Common at CreditAgency" name="conversationType"/>
+ </participantTypes>
+ <participantTypes description="This is the participant type sup:Supplier" name="sup:Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
+ <semanticAnnotations annotation="" 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">
+ <participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/@roleTypes.3">
+ <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
+ </participantDefinitions>
+ <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" toParticipant="//@choreographies.0/@enclosedChoreographies.0/@participantDefinitions.0">
+ <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">
+ <participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/@roleTypes.3">
+ <semanticAnnotations annotation="savara.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
+ </participantDefinitions>
+ <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" toParticipant="//@choreographies.0/@enclosedChoreographies.1/@participantDefinitions.0">
+ <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"/>
+ </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: runtime/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- runtime/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/brokerage/supplier/src/main/resources/META-INF/jboss-esb.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -39,7 +39,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_1" process="process">
<property name="operation" value="confirm"/>
- <property name="messageType" value="orderConfirmed"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}orderConfirmed"/>
<property name="clientRole" value="Broker" />
<property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
@@ -47,7 +47,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierTxnProcessor__1_action_2" process="process">
<property name="operation" value="confirm"/>
- <property name="messageType" value="bookingReference"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}bookingReference"/>
<property name="clientRole" value="Broker"/>
<property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
@@ -76,7 +76,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_1" process="process">
<property name="operation" value="getQuote"/>
- <property name="messageType" value="requestForQuote"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}requestForQuote"/>
<property name="clientRole" value="Broker" />
<property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
@@ -84,7 +84,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="ESBBrokerProcess_SupplierQuoteEngine__1_action_2" process="process">
<property name="operation" value="getQuote"/>
- <property name="messageType" value="quote"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/supplier}quote"/>
<property name="clientRole" value="Broker"/>
<property name="eprStore" value="org.jboss.savara.examples.supplier.MemoryEPRStorage" />
</action>
Modified: runtime/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- runtime/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/common/creditAgency/src/main/resources/META-INF/jboss-esb.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -45,7 +45,7 @@
<property name="conversationType" value="savara.samples.Common at CreditAgency"/>
<property name="paths">
<case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_CreditAgency__1">
- <message type="CreditCheckRequest"/>
+ <message type="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest"/>
</case>
</property>
</action>
@@ -58,7 +58,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_CreditAgency__1_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckRequest"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest"/>
<property name="clientRole" value="Store" />
<property name="eprStore" value="org.jboss.savara.examples.creditAgency.MemoryEPRStorage" />
</action>
@@ -79,7 +79,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__2_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckOk"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckOk"/>
<property name="clientRole" value="Store"/>
<property name="eprStore" value="org.jboss.savara.examples.creditAgency.MemoryEPRStorage" />
</action>
@@ -94,7 +94,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_CreditAgency__3_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckInvalid"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid"/>
<property name="clientRole" value="Store"/>
<property name="eprStore" value="org.jboss.savara.examples.creditAgency.MemoryEPRStorage" />
</action>
Modified: runtime/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -1 +1 @@
-<BuyConfirmed id="1" />
\ No newline at end of file
+<BuyConfirmed xmlns="http://www.jboss.org/examples/store" id="1" />
\ No newline at end of file
Modified: runtime/trunk/samples/jbossesb/purchasing/models/BuyRequest.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/BuyRequest.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/BuyRequest.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -1 +1 @@
-<BuyRequest id="1" />
\ No newline at end of file
+<BuyRequest xmlns="http://www.jboss.org/examples/store" id="1" />
\ No newline at end of file
Modified: runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckInvalid.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckInvalid.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckInvalid.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -1 +1 @@
-<CreditCheckInvalid id="1" />
\ No newline at end of file
+<CreditCheckInvalid xmlns="http://www.jboss.org/examples/creditAgency" id="1" />
\ No newline at end of file
Modified: runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -1 +1 @@
-<CreditCheckOk id="1" />
\ No newline at end of file
+<CreditCheckOk xmlns="http://www.jboss.org/examples/creditAgency" id="1" />
\ No newline at end of file
Modified: runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckRequest.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckRequest.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/CreditCheckRequest.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -1 +1 @@
-<CreditCheckRequest id="1" />
\ No newline at end of file
+<CreditCheckRequest xmlns="http://www.jboss.org/examples/creditAgency" id="1" />
\ No newline at end of file
Modified: runtime/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn 2009-11-30 15:45:25 UTC (rev 95)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="Cp1252"?>
-<scn:Scenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:scn="http://www.pi4soa.org/scenario" name="InvalidPurchase" description="Invalid purchase goods" author="" choreographyDescriptionURL="PurchaseGoods.cdm">
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" messageType="BuyRequest" valueURL="BuyRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" direction="receive" messageType="BuyRequest" valueURL="BuyRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" direction="receive" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" faultName="{http://www.pi4soa.org/purchase}CreditCheckFailed" isRequest="false" messageType="CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" faultName="{http://www.pi4soa.org/purchase}CreditCheckFailed" isRequest="false" direction="receive" messageType="CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" isRequest="false" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/>
- <messageLinks source="//@scenarioObjects.0" target="//@scenarioObjects.1"/>
- <messageLinks source="//@scenarioObjects.2" target="//@scenarioObjects.3"/>
- <messageLinks source="//@scenarioObjects.4" target="//@scenarioObjects.5"/>
- <messageLinks source="//@scenarioObjects.6" target="//@scenarioObjects.7"/>
- <participants type="Buyer"/>
- <participants type="Store"/>
- <participants type="CreditAgency"/>
-</scn:Scenario>
+<?xml version="1.0" encoding="UTF-8"?>
+<scn:Scenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:scn="http://www.pi4soa.org/scenario" name="InvalidPurchase" description="Invalid purchase goods" author="" choreographyDescriptionURL="PurchaseGoods.cdm">
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" messageType="{http://www.jboss.org/examples/store}BuyRequest" valueURL="BuyRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" direction="receive" messageType="{http://www.jboss.org/examples/store}BuyRequest" valueURL="BuyRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" direction="receive" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" faultName="{http://www.jboss.org/savara/examples}CreditCheckFailed" isRequest="false" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" faultName="{http://www.jboss.org/savara/examples}CreditCheckFailed" isRequest="false" direction="receive" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" isRequest="false" messageType="{http://www.jboss.org/examples/store}BuyConfirmed" valueURL="BuyConfirmed.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="{http://www.jboss.org/examples/store}BuyConfirmed" valueURL="BuyConfirmed.xml"/>
+ <messageLinks source="//@scenarioObjects.0" target="//@scenarioObjects.1"/>
+ <messageLinks source="//@scenarioObjects.2" target="//@scenarioObjects.3"/>
+ <messageLinks source="//@scenarioObjects.4" target="//@scenarioObjects.5"/>
+ <messageLinks source="//@scenarioObjects.6" target="//@scenarioObjects.7"/>
+ <participants type="Buyer"/>
+ <participants type="sto:Store"/>
+ <participants type="ca:CreditAgency"/>
+</scn:Scenario>
Modified: runtime/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2009-11-30 15:45:25 UTC (rev 95)
@@ -3,13 +3,15 @@
<typeDefinitions>
<nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.jboss.org/savara/examples"/>
<nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
- <nameSpaces prefix="pur" uRI="java:org.jboss.savara.examples.purchasing"/>
- <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" elementName="BuyConfirmed"/>
- <informationTypes description="This is the information type BuyFailed" name="BuyFailed" elementName="BuyFailed"/>
- <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="" elementName="BuyRequest"/>
- <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" elementName="CreditCheckInvalid"/>
- <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" elementName="CreditCheckOk"/>
- <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" elementName="CreditCheckRequest"/>
+ <nameSpaces prefix="pur" uRI="http://www.jboss.org/examples/purchasing"/>
+ <nameSpaces prefix="sto" uRI="http://www.jboss.org/examples/store"/>
+ <nameSpaces prefix="ca" uRI="http://www.jboss.org/examples/creditAgency"/>
+ <informationTypes description="This is the information type BuyConfirmed" name="BuyConfirmed" typeName="sto:BuyConfirmed" elementName=""/>
+ <informationTypes description="This is the information type BuyFailed" name="BuyFailed" typeName="sto:BuyFailed" elementName=""/>
+ <informationTypes description="This is the information type BuyRequest" name="BuyRequest" typeName="sto:BuyRequest" elementName=""/>
+ <informationTypes description="This is the information type CreditCheckInvalid" name="CreditCheckInvalid" typeName="ca:CreditCheckInvalid" elementName=""/>
+ <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" typeName="ca:CreditCheckOk" elementName=""/>
+ <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" typeName="ca:CreditCheckRequest" elementName=""/>
<informationTypes description="This is the information type IDType" name="IDType" typeName="xsd:string"/>
<informationTypes description="This is the information type URITokenType" name="URITokenType" typeName="xsd:anyURI"/>
<tokens description="This is the token ID" name="ID" informationType="//@typeDefinitions/@informationTypes.6"/>
@@ -24,20 +26,20 @@
<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"/>
+ <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior" interface="ca:CreditAgencyInterface"/>
</roleTypes>
<roleTypes description="This is the role type Store" name="Store">
- <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior"/>
+ <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior" interface="sto:StoreInterface"/>
</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="savara.samples.Purchasing at Buyer" name="conversationType"/>
</participantTypes>
- <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
+ <participantTypes description="This is the participant type ca:CreditAgency" name="ca:CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
<semanticAnnotations annotation="savara.samples.Common at CreditAgency" name="conversationType"/>
</participantTypes>
- <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/@roleTypes.2">
+ <participantTypes description="This is the participant type sto:Store" name="sto:Store" roleTypes="//@typeDefinitions/@roleTypes.2">
<semanticAnnotations annotation="savara.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">
Modified: runtime/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn 2009-11-30 15:45:25 UTC (rev 95)
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="Cp1252"?>
-<scn:Scenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:scn="http://www.pi4soa.org/scenario" name="SuccessfulPurchase" description="Successfully purchase goods" author="" choreographyDescriptionURL="PurchaseGoods.cdm">
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" messageType="BuyRequest" valueURL="BuyRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" direction="receive" messageType="BuyRequest" valueURL="BuyRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" direction="receive" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" isRequest="false" messageType="CreditCheckOk" valueURL="CreditCheckOk.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" isRequest="false" direction="receive" messageType="CreditCheckOk" valueURL="CreditCheckOk.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" isRequest="false" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/>
- <messageLinks source="//@scenarioObjects.0" target="//@scenarioObjects.1"/>
- <messageLinks source="//@scenarioObjects.2" target="//@scenarioObjects.3"/>
- <messageLinks source="//@scenarioObjects.4" target="//@scenarioObjects.5"/>
- <messageLinks source="//@scenarioObjects.6" target="//@scenarioObjects.7"/>
- <participants type="Buyer"/>
- <participants type="Store"/>
- <participants type="CreditAgency"/>
-</scn:Scenario>
+<?xml version="1.0" encoding="UTF-8"?>
+<scn:Scenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:scn="http://www.pi4soa.org/scenario" name="SuccessfulPurchase" description="Successfully purchase goods" author="" choreographyDescriptionURL="PurchaseGoods.cdm">
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" messageType="{http://www.jboss.org/examples/store}BuyRequest" valueURL="BuyRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" direction="receive" messageType="{http://www.jboss.org/examples/store}BuyRequest" valueURL="BuyRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" direction="receive" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest" valueURL="CreditCheckRequest.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.2" operationName="checkCredit" isRequest="false" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckOk" valueURL="CreditCheckOk.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" isRequest="false" direction="receive" messageType="{http://www.jboss.org/examples/creditAgency}CreditCheckOk" valueURL="CreditCheckOk.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" isRequest="false" messageType="{http://www.jboss.org/examples/store}BuyConfirmed" valueURL="BuyConfirmed.xml"/>
+ <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="{http://www.jboss.org/examples/store}BuyConfirmed" valueURL="BuyConfirmed.xml"/>
+ <messageLinks source="//@scenarioObjects.0" target="//@scenarioObjects.1"/>
+ <messageLinks source="//@scenarioObjects.2" target="//@scenarioObjects.3"/>
+ <messageLinks source="//@scenarioObjects.4" target="//@scenarioObjects.5"/>
+ <messageLinks source="//@scenarioObjects.6" target="//@scenarioObjects.7"/>
+ <participants type="Buyer"/>
+ <participants type="sto:Store"/>
+ <participants type="ca:CreditAgency"/>
+</scn:Scenario>
Modified: runtime/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml
===================================================================
--- runtime/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-11-27 18:54:32 UTC (rev 94)
+++ runtime/trunk/samples/jbossesb/purchasing/store/src/main/resources/META-INF/jboss-esb.xml 2009-11-30 15:45:25 UTC (rev 95)
@@ -29,7 +29,7 @@
<property name="conversationType" value="savara.samples.Purchasing at Store"/>
<property name="paths">
<case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__1">
- <message type="BuyRequest"/>
+ <message type="{http://www.jboss.org/examples/store}BuyRequest"/>
</case>
</property>
</action>
@@ -42,7 +42,7 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__1_action_1" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="BuyRequest"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/store}BuyRequest"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
@@ -50,7 +50,7 @@
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__1_action_2" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckRequest"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckRequest"/>
<property name="serviceCategory" value="org.jboss.savara.examples.purchasegoods"/>
<property name="serviceName" value="PurchaseGoodsProcess_CreditAgency"/>
<property name="responseServiceCategory" value="org.jboss.savara.examples.purchasegoods"/>
@@ -65,13 +65,13 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__2_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckOk"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckOk"/>
</action>
<action name="purchasing-success" class="org.jboss.savara.examples.store.SetBuyResponseMessageAction">
</action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__2_action_2" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="BuyConfirmed"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/store}BuyConfirmed"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
@@ -84,12 +84,12 @@
<actions mep="OneWay">
<action class="org.jboss.savara.jbossesb.actions.ReceiveMessageAction" name="PurchaseGoodsProcess_Store__3_action_1" process="process">
<property name="operation" value="checkCredit"/>
- <property name="messageType" value="CreditCheckInvalid"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid"/>
</action>
<action name="purchasing-failed" class="org.jboss.savara.examples.store.SetBuyFailedMessageAction"></action>
<action class="org.jboss.savara.jbossesb.actions.SendMessageAction" name="PurchaseGoodsProcess_Store__3_action_2" process="process">
<property name="operation" value="buy"/>
- <property name="messageType" value="BuyFailed"/>
+ <property name="messageType" value="{http://www.jboss.org/examples/store}BuyFailed"/>
<property name="clientRole" value="Buyer"/>
<property name="eprStore" value="org.jboss.savara.examples.store.MemoryEPRStorage" />
</action>
@@ -103,10 +103,10 @@
<action class="org.jboss.savara.jbossesb.actions.SwitchAction" name="checkCredit_action_1" process="process">
<property name="paths">
<case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__2">
- <message type="CreditCheckOk"/>
+ <message type="{http://www.jboss.org/examples/creditAgency}CreditCheckOk"/>
</case>
<case service-category="org.jboss.savara.examples.purchasegoods" service-name="PurchaseGoodsProcess_Store__3">
- <message type="CreditCheckInvalid"/>
+ <message type="{http://www.jboss.org/examples/creditAgency}CreditCheckInvalid"/>
</case>
</property>
</action>
More information about the savara-commits
mailing list