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=&quot;//(a)participants.2&quot; operationName="checkCredit" direction="receive" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/> <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.2&quot; operationName="checkCredit" faultName="{http://www.pi4soa.org/purchase}CreditCheckFailed" isRequest="false" messageType="CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/> <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="checkCredit" faultName="{http://www.pi4soa.org/purchase}CreditCheckFailed" isRequest="false" direction="receive" messageType="CreditCheckInvalid" valueURL="CreditCheckInvalid.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="buy" isRequest="false" messageType="BuyResponse" valueURL="BuyResponse.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.0&quot; operationName="buy" isRequest="false" direction="receive" messageType="BuyResponse" valueURL="BuyResponse.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="buy" isRequest="false" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.0&quot; operationName="buy" isRequest="false" direction="receive" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/> <messageLinks source=&quot;//(a)scenarioObjects.0&quot; target=&quot;//(a)scenarioObjects.1&quot;/&gt; <messageLinks source=&quot;//(a)scenarioObjects.2&quot; target=&quot;//(a)scenarioObjects.3&quot;/&gt; <messageLinks source=&quot;//(a)scenarioObjects.4&quot; target=&quot;//(a)scenarioObjects.5&quot;/&gt; 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=&quot;//@typeDefinitions/(a)informationTypes.6&quot;/&gt; <tokens description="This is the token URIToken" name="URIToken" informationType=&quot;//@typeDefinitions/(a)informationTypes.7&quot;/&gt; - <tokenLocators description="This is the token locator BuyFailedIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.0&quot; query="//@id" name="BuyFailedIDLocator"/> - <tokenLocators description="This is the token locator BuyRequestIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.1&quot; query="//@id" name="BuyRequestIDLocator"/> - <tokenLocators description="This is the token locator BuyResponseIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.2&quot; query="//@id" name="BuyResponseIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.4&quot; query="//@id" name="CreditCheckInvalidIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.3&quot; query="//@id" name="CreditCheckRequestIDLocator"/> - <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.5&quot; query="//@id" name="CreditCheckResponseIDLocator"/> + <tokenLocators description="This is the token locator BuyFailedIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.1&quot; query="//@id" name="BuyFailedIDLocator"/> + <tokenLocators description="This is the token locator BuyRequestIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.2&quot; query="//@id" name="BuyRequestIDLocator"/> + <tokenLocators description="This is the token locator BuyResponseIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.0&quot; query="//@id" name="BuyResponseIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckInvalidIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.3&quot; query="//@id" name="CreditCheckInvalidIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.5&quot; query="//@id" name="CreditCheckRequestIDLocator"/> + <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token=&quot;//@typeDefinitions/(a)tokens.0&quot; informationType=&quot;//@typeDefinitions/(a)informationTypes.4&quot; 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=&quot;//@typeDefinitions/(a)channelTypes.0&quot;/&gt; - <variableDefinitions description="Channel to facilitate interaction to Store" name="StoreChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type=&quot;//@typeDefinitions/(a)channelTypes.1&quot;/&gt; + <variableDefinitions description="This is the variable buy" name="buy" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot;/&gt; <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyRequest" operation="buy" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.1&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.0&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.1&quot;/&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction BuyRequest" name="BuyRequestRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot;/&gt; </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckRequest" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheckRequest" name="CreditCheckRequestRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.3&quot;/&gt; + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequestExchange" type=&quot;//@typeDefinitions/(a)informationTypes.5&quot;/&gt; </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=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckResponse" name="CreditCheckResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.5&quot; action="Respond"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheckOk" operation="checkCredit" channelVariable=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckOk" name="CreditCheckOkRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.4&quot; action="Respond"/> </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyResponse" operation="buy" channelVariable=&quot;//@choreographies.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 BuyResponse" name="BuyResponseRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.2&quot; action="Respond"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyConfirmed" operation="buy" channelVariable=&quot;//@choreographies.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 BuyConfirmed" name="BuyConfirmedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; 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=&quot;//@choreographies.0/(a)variableDefinitions.0&quot; relationship=&quot;//@typeDefinitions/(a)relationshipTypes.1&quot;&gt; - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.4&quot; action="Respond" faultName="CreditCheckFailed"/> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheckFailed" name="CreditCheckFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.3&quot; action="Respond" faultName="CreditCheckFailed"/> </activities> <activities xsi:type="org.pi4soa.cdl:Interaction" name="BuyFailed" operation="buy" channelVariable=&quot;//@choreographies.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 BuyFailed" name="BuyFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.0&quot; action="Respond" faultName="BuyFailed"/> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction BuyFailed" name="BuyFailedRespondExchange" type=&quot;//@typeDefinitions/(a)informationTypes.1&quot; 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=&quot;//(a)participants.1&quot; operationName="buy" direction="receive" messageType="BuyRequest" valueURL="BuyRequest.xml"/> <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="checkCredit" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/> <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.2&quot; operationName="checkCredit" direction="receive" messageType="CreditCheckRequest" valueURL="CreditCheckRequest.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.2&quot; operationName="checkCredit" isRequest="false" messageType="CreditCheckResponse" valueURL="CreditCheckResponse.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="checkCredit" isRequest="false" direction="receive" messageType="CreditCheckResponse" valueURL="CreditCheckResponse.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="buy" isRequest="false" messageType="BuyResponse" valueURL="BuyResponse.xml"/> - <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.0&quot; operationName="buy" isRequest="false" direction="receive" messageType="BuyResponse" valueURL="BuyResponse.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.2&quot; operationName="checkCredit" isRequest="false" messageType="CreditCheckOk" valueURL="CreditCheckOk.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="checkCredit" isRequest="false" direction="receive" messageType="CreditCheckOk" valueURL="CreditCheckOk.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.1&quot; operationName="buy" isRequest="false" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/> + <scenarioObjects xsi:type="scn:MessageEvent" participant=&quot;//(a)participants.0&quot; operationName="buy" isRequest="false" direction="receive" messageType="BuyConfirmed" valueURL="BuyConfirmed.xml"/> <messageLinks source=&quot;//(a)scenarioObjects.0&quot; target=&quot;//(a)scenarioObjects.1&quot;/&gt; <messageLinks source=&quot;//(a)scenarioObjects.2&quot; target=&quot;//(a)scenarioObjects.3&quot;/&gt; <messageLinks source=&quot;//(a)scenarioObjects.4&quot; target=&quot;//(a)scenarioObjects.5&quot;/&gt;