[overlord-commits] Overlord SVN: r331 - cdl/trunk/samples/jbossesb/purchasing/models.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Sep 17 11:21:46 EDT 2008
Author: objectiser
Date: 2008-09-17 11:21:46 -0400 (Wed, 17 Sep 2008)
New Revision: 331
Added:
cdl/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml
cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml
Removed:
cdl/trunk/samples/jbossesb/purchasing/models/BuyResponse.xml
cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckResponse.xml
Modified:
cdl/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn
cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
cdl/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn
Log:
Updated purchasing model to make message types more consistent with the choreography description abstract types, to make it easier when referring to the diagrams in a document.
Added: cdl/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/models/BuyConfirmed.xml 2008-09-17 15:21:46 UTC (rev 331)
@@ -0,0 +1 @@
+<BuyConfirmed id="1" />
\ No newline at end of file
Deleted: cdl/trunk/samples/jbossesb/purchasing/models/BuyResponse.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/BuyResponse.xml 2008-09-17 14:30:52 UTC (rev 330)
+++ cdl/trunk/samples/jbossesb/purchasing/models/BuyResponse.xml 2008-09-17 15:21:46 UTC (rev 331)
@@ -1 +0,0 @@
-<BuyResponse id="1" />
\ No newline at end of file
Added: cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckOk.xml 2008-09-17 15:21:46 UTC (rev 331)
@@ -0,0 +1 @@
+<CreditCheckOk id="1" />
\ No newline at end of file
Deleted: cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckResponse.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckResponse.xml 2008-09-17 14:30:52 UTC (rev 330)
+++ cdl/trunk/samples/jbossesb/purchasing/models/CreditCheckResponse.xml 2008-09-17 15:21:46 UTC (rev 331)
@@ -1 +0,0 @@
-<CreditCheckResponse id="1" />
\ No newline at end of file
Modified: cdl/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn 2008-09-17 14:30:52 UTC (rev 330)
+++ cdl/trunk/samples/jbossesb/purchasing/models/InvalidPurchase.scn 2008-09-17 15:21:46 UTC (rev 331)
@@ -6,8 +6,8 @@
<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="BuyResponse" valueURL="BuyResponse.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="BuyResponse" valueURL="BuyResponse.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"/>
Modified: cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-17 14:30:52 UTC (rev 330)
+++ cdl/trunk/samples/jbossesb/purchasing/models/PurchaseGoods.cdm 2008-09-17 15:21:46 UTC (rev 331)
@@ -3,22 +3,23 @@
<typeDefinitions>
<nameSpaces description="Target Namespace for PurchaseGoods" prefix="tns" uRI="http://www.pi4soa.org/purchase"/>
<nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
+ <nameSpaces prefix="pur" uRI="java:com.acme.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" elementName="BuyRequest"/>
- <informationTypes description="This is the information type BuyResponse" name="BuyResponse" elementName="BuyResponse"/>
- <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 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"/>
<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"/>
<tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/@informationTypes.7"/>
- <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.0" query="//@id" name="BuyFailedIDLocator"/>
- <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.1" query="//@id" name="BuyRequestIDLocator"/>
- <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.2" query="//@id" name="BuyResponseIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.4" query="//@id" name="CreditCheckInvalidIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.3" query="//@id" name="CreditCheckRequestIDLocator"/>
- <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.5" query="//@id" name="CreditCheckResponseIDLocator"/>
+ <tokenLocators description="This is the token locator BuyFailedIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.1" query="//@id" name="BuyFailedIDLocator"/>
+ <tokenLocators description="This is the token locator BuyRequestIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.2" query="//@id" name="BuyRequestIDLocator"/>
+ <tokenLocators description="This is the token locator BuyResponseIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.0" query="//@id" name="BuyResponseIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.3" query="//@id" name="CreditCheckInvalidIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.5" query="//@id" name="CreditCheckRequestIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/@tokens.0" informationType="//@typeDefinitions/@informationTypes.4" query="//@id" name="CreditCheckResponseIDLocator"/>
<roleTypes description="This is the role type Buyer" name="Buyer">
<behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/>
</roleTypes>
@@ -48,28 +49,29 @@
</typeDefinitions>
<choreographies description="Choreography flow for the PurchaseGoods process" name="PurchaseGoodsProcess" root="true">
<variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.0"/>
- <variableDefinitions description="Channel to facilitate interaction to Store" name="StoreChannel" type="//@typeDefinitions/@channelTypes.1"/>
+ <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.1"/>
+ <variableDefinitions description="This is the variable buy" name="buy" type="//@typeDefinitions/@informationTypes.2"/>
<activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type="//@typeDefinitions/@informationTypes.2"/>
</activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheckRequest" name="CreditCheckRequestRequestExchange" type="//@typeDefinitions/@informationTypes.3"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type="//@typeDefinitions/@informationTypes.5"/>
</activities>
<activities xsi:type="org.pi4soa.cdl:Choice" description="Is credit ok?">
<activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Valid">
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckResponse" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckResponse" name="CreditCheckResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond"/>
</activities>
- <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyResponse" name="BuyResponseRespondExchange" type="//@typeDefinitions/@informationTypes.2" action="Respond"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyConfirmed" name="BuyConfirmedRespondExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond"/>
</activities>
</activities>
<activities xsi:type="org.pi4soa.cdl:Sequence" description="Credit Invalid">
<activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckFailed" operation="checkCredit" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="CreditCheckFailed"/>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type="//@typeDefinitions/@informationTypes.3" action="Respond" faultName="CreditCheckFailed"/>
</activities>
<activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable="//@choreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
- <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond" faultName="BuyFailed"/>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type="//@typeDefinitions/@informationTypes.1" action="Respond" faultName="BuyFailed"/>
</activities>
</activities>
</activities>
Modified: cdl/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn 2008-09-17 14:30:52 UTC (rev 330)
+++ cdl/trunk/samples/jbossesb/purchasing/models/SuccessfulPurchase.scn 2008-09-17 15:21:46 UTC (rev 331)
@@ -4,10 +4,10 @@
<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="CreditCheckResponse" valueURL="CreditCheckResponse.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="checkCredit" isRequest="false" direction="receive" messageType="CreditCheckResponse" valueURL="CreditCheckResponse.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.1" operationName="buy" isRequest="false" messageType="BuyResponse" valueURL="BuyResponse.xml"/>
- <scenarioObjects xsi:type="scn:MessageEvent" participant="//@participants.0" operationName="buy" isRequest="false" direction="receive" messageType="BuyResponse" valueURL="BuyResponse.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"/>
More information about the overlord-commits
mailing list