[savara-commits] savara SVN: r85 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: plugintest/org/jboss/savara/tools/bpel/generator/results and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Nov 15 08:03:58 EST 2009
Author: objectiser
Date: 2009-11-15 08:03:58 -0500 (Sun, 15 Nov 2009)
New Revision: 85
Added:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.expected
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Buyer.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at CreditAgency.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Store.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Broker.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Buyer.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at CreditAgency.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierQuoteEngine.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierTxnProcessor.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Buyer.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at CreditAgency.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Store.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Buyer.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.scv
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Broker.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Buyer.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at CreditAgency.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierQuoteEngine.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierTxnProcessor.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Buyer.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at CreditAgency.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Store.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Buyer.bpel
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Seller.bpel
Log:
Final updates to WSDL/BPEL and fixing the plugin tests. Still issue with fault handling to be resolved when deploying to RiftSaw.
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-11-15 13:03:58 UTC (rev 85)
@@ -272,12 +272,20 @@
java.util.List<javax.wsdl.Definition> defns=generator.generateDefinitions(contract,
new SOAPRPCWSDLBinding());
+ // Check if contract has atleast one message exchange pattern
+ boolean f_hasMEP=false;
+
+ for (int i=0; f_hasMEP == false && i < contract.getInterfaces().size(); i++) {
+ Interface intf=contract.getInterfaces().get(i);
+ f_hasMEP = (intf.getMessageExchangePatterns().size() > 0);
+ }
+
for (int i=defns.size()-1; i >= 0; i--) {
javax.wsdl.Definition defn=defns.get(i);
// Check if definition has a port type
if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0
- || defn.getServices().size() > 0) {
+ || (f_hasMEP && defn.getServices().size() > 0)) {
String filename=getWSDLFileName(role, localcm.getModelName().getName(), i);
if (i > 0) {
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Buyer.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,23 +1,23 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing at Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing at Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.jboss.org/savara/examples"/>
<partnerLinks>
<partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
- <variable messageType="BuyRequest" name="buyRequestVar"/>
- <variable messageType="BuyConfirmed" name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
+ <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="BuyFailed" faultName="BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="sto:BuyFailed" faultName="sto:BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="tns:StoreBehavior"/>
+ <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/>
</sequence>
</scope>
</sequence>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at CreditAgency.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,24 +1,24 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common at CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Common at CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<partnerLinks>
- <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyServiceLT"/>
+ <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="pur:CreditCheckInvalid" name="creditCheckInvalidVar"/>
</variables>
<sequence>
- <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"/>
+ <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckRequestVar"/>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/>
+ <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="tns:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/>
+ <reply faultName="pur:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Store.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Store.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods at Store.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,31 +1,31 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing at Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing at Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.jboss.org/examples/store"/>
<partnerLinks>
- <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="tns:BuyerToStoreServiceLT"/>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
+ <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
- <variable messageType="BuyRequest" name="buyRequestVar"/>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="BuyConfirmed" name="buyConfirmedVar"/>
- <variable messageType="BuyFailed" name="buyFailedVar"/>
+ <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
+ <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyFailed" name="buyFailedVar"/>
</variables>
<sequence>
- <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyRequestVar"/>
+ <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid" faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="pur:CreditCheckInvalid" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar">
<sequence>
- <reply faultName="tns:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyFailedVar"/>
+ <reply faultName="sto:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyFailedVar"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior"/>
- <reply operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyConfirmedVar"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/>
+ <reply operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyConfirmedVar"/>
</sequence>
</scope>
</sequence>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/testmodels/PurchaseGoods.cdm 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,79 +1,80 @@
-<?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 PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.pi4soa.org/purchase">
- <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" 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.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>
- <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 Store" name="Store">
- <behaviors description="This is the behavior StoreBehavior" name="StoreBehavior"/>
- </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="overlord.cdl.samples.Purchasing at Buyer" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type CreditAgency" name="CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
- <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
- </participantTypes>
- <participantTypes description="This is the participant type Store" name="Store" roleTypes="//@typeDefinitions/@roleTypes.2">
- <semanticAnnotations annotation="overlord.cdl.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">
- <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
- </channelTypes>
- <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.2">
- <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
- </channelTypes>
- </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 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.2"/>
- </activities>
- <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="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="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.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.1" action="Respond" faultName="BuyFailed"/>
- </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 PurchaseGoods" name="PurchaseGoods" author="gary" version="0.1" targetNamespace="http://www.jboss.org/savara/examples">
+ <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"/>
+ <nameSpaces prefix="sto" uRI="http://www.jboss.org/examples/store"/>
+ <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="pur:CreditCheckInvalid" elementName=""/>
+ <informationTypes description="This is the information type CreditCheckOk" name="CreditCheckOk" typeName="pur:CreditCheckOk" elementName=""/>
+ <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" typeName="pur: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"/>
+ <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.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>
+ <roleTypes description="This is the role type CreditAgency" name="CreditAgency">
+ <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior" interface="pur:CreditAgencyInterface"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Store" name="Store">
+ <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 pur:CreditAgency" name="pur:CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.1">
+ <semanticAnnotations annotation="savara.samples.Common at CreditAgency" name="conversationType"/>
+ </participantTypes>
+ <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">
+ <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type StoreChannelType" name="StoreChannelType" referenceToken="//@typeDefinitions/@tokens.1" roleType="//@typeDefinitions/@roleTypes.2">
+ <identities description="ID" tokens="//@typeDefinitions/@tokens.0"/>
+ </channelTypes>
+ </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 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.2"/>
+ </activities>
+ <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="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="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.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.1" action="Respond" faultName="BuyFailed"/>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-15 13:03:58 UTC (rev 85)
@@ -33,7 +33,6 @@
public static TestSuite suite() {
TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests");
- /*
suite.addTest(new BPELToConversationTest("ESBBroker at Broker"));
suite.addTest(new BPELToConversationTest("ESBBroker at Buyer"));
suite.addTest(new BPELToConversationTest("ESBBroker at CreditAgency"));
@@ -45,8 +44,7 @@
suite.addTest(new BPELToConversationTest("ReqRespFault at Buyer"));
suite.addTest(new BPELToConversationTest("ReqRespFault at Seller"));
suite.addTest(new BPELToConversationTest("LoanApprovalService at Service"));
- */
-
+
return suite;
}
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Broker.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Broker.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Broker.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation ESBBrokerProcess_Broker at Broker implements ESBBroker at Broker {
+conversation ESBBrokerProcess_Broker at Broker implements LoanBroker at Broker {
makeEnquiry(enquiry) from Buyer to Broker;
while {
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Buyer.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Buyer.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at Buyer.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation ESBBrokerProcess_Buyer at Buyer implements ESBBroker at Buyer {
+conversation ESBBrokerProcess_Buyer at Buyer implements LoanBroker at Buyer {
makeEnquiry(enquiry) from Buyer to Broker;
makeEnquiry(quoteList) from Broker to Buyer;
if {
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at CreditAgency.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at CreditAgency.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at CreditAgency.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation ESBBrokerProcess_CreditAgency at CreditAgency implements ESBBroker at CreditAgency {
+conversation ESBBrokerProcess_CreditAgency at CreditAgency implements Common at CreditAgency {
if {
checkCredit(CreditCheckRequest) from Broker to CreditAgency;
if {
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierQuoteEngine.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierQuoteEngine.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierQuoteEngine.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation RequestForQuote_SupplierQuoteEngine at SupplierQuoteEngine implements ESBBroker at SupplierQuoteEngine {
+conversation RequestForQuote_SupplierQuoteEngine at SupplierQuoteEngine implements LoanBroker at SupplierQuoteEngine {
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
getQuote(quote) from SupplierQuoteEngine to Broker;
}
\ No newline at end of file
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierTxnProcessor.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierTxnProcessor.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker at SupplierTxnProcessor.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation CompleteTransaction_SupplierTxnProcessor at SupplierTxnProcessor implements ESBBroker at SupplierTxnProcessor {
+conversation CompleteTransaction_SupplierTxnProcessor at SupplierTxnProcessor implements LoanBroker at SupplierTxnProcessor {
if {
confirm(orderConfirmed) from Broker to SupplierTxnProcessor;
confirm(bookingReference) from SupplierTxnProcessor to Broker;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Buyer.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Buyer.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Buyer.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation PurchaseGoodsProcess_Buyer at Buyer implements PurchaseGoods at Buyer {
+conversation PurchaseGoodsProcess_Buyer at Buyer implements Purchasing at Buyer {
buy(BuyRequest) from Buyer to Store;
if {
buy(BuyConfirmed) from Store to Buyer;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at CreditAgency.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at CreditAgency.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at CreditAgency.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation PurchaseGoodsProcess_CreditAgency at CreditAgency implements PurchaseGoods at CreditAgency {
+conversation PurchaseGoodsProcess_CreditAgency at CreditAgency implements Common at CreditAgency {
checkCredit(CreditCheckRequest) from Store to CreditAgency;
if {
checkCredit(CreditCheckOk) from CreditAgency to Store;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Store.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Store.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/PurchaseGoods at Store.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation PurchaseGoodsProcess_Store at Store implements PurchaseGoods at Store {
+conversation PurchaseGoodsProcess_Store at Store implements Purchasing at Store {
buy(BuyRequest) from Buyer to Store;
checkCredit(CreditCheckRequest) from Store to CreditAgency;
if {
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Buyer.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Buyer.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Buyer.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation ReqRespFaultProcess_Buyer at Buyer implements ReqRespFault at Buyer {
+conversation ReqRespFaultProcess_Buyer at Buyer implements LoanBroker at Buyer {
checkCredit(CreditCheckRequest) from Buyer to Seller;
if {
checkCredit(CreditCheckOk) from Seller to Buyer;
Added: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.expected
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.expected (rev 0)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.expected 2009-11-15 13:03:58 UTC (rev 85)
@@ -0,0 +1,10 @@
+namespace null;
+
+conversation ReqRespFaultProcess_Seller at Seller implements ReqRespFaultProcess at Seller {
+ checkCredit(CreditCheckRequest) from Buyer to Seller;
+ if {
+ checkCredit(CreditCheckOk) from Seller to Buyer;
+ } else if {
+ checkCredit(CreditCheckInvalid) from Seller to Buyer;
+ }
+}
\ No newline at end of file
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.scv
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.scv 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ReqRespFault at Seller.scv 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace null;
-conversation ReqRespFaultProcess_Seller at Seller implements ReqRespFault at Seller {
+conversation ReqRespFaultProcess_Seller at Seller implements ReqRespFaultProcess at Seller {
checkCredit(CreditCheckRequest) from Buyer to Seller;
if {
checkCredit(CreditCheckOk) from Seller to Buyer;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Broker.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Broker.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Broker.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,9 +1,13 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker at Broker" name="ESBBrokerProcess_Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="BrokerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
<partnerLinks>
- <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="BuyerToBrokerServiceLT"/>
- <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
- <partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
+ <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerServiceLT"/>
+ <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="tns:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
+ <partnerLink name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<variables>
<variable messageType="enquiry" name="enquiryVar"/>
@@ -15,46 +19,45 @@
<variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
<variable messageType="orderConfirmed" name="orderConfirmedVar"/>
<variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
<variable messageType="orderRejected" name="orderRejectedVar"/>
<variable messageType="cancel" name="cancelVar"/>
</variables>
<sequence>
- <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="enquiryVar"/>
+ <receive createInstance="yes" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/>
<while>
<sequence>
<scope>
<sequence>
- <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
+ <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior"/>
</sequence>
</scope>
</sequence>
</while>
- <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="quoteListVar"/>
+ <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/>
<pick>
- <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="buyVar">
+ <onMessage operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="buyVar">
<sequence>
<scope>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="invalidCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar">
<sequence>
- <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="orderRejectedVar"/>
+ <reply faultName="tns:rejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
- <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="bookingReferenceVar"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior"/>
+ <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior"/>
+ <reply operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="bookingReferenceVar"/>
</sequence>
</scope>
</sequence>
</scope>
</sequence>
</onMessage>
- <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT" variable="cancelVar">
+ <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="cancelVar">
<sequence/>
</onMessage>
</pick>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Buyer.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,30 +1,33 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker at Buyer" name="ESBBrokerProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
<partnerLinks>
- <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="BuyerToBrokerLT" partnerRole="BrokerRequester"/>
+ <partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerLT" partnerRole="BrokerRequester"/>
</partnerLinks>
<variables>
<variable messageType="enquiry" name="enquiryVar"/>
<variable messageType="quoteList" name="quoteListVar"/>
<variable messageType="buy" name="buyVar"/>
<variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="orderRejected" name="orderRejectedVar"/>
<variable messageType="cancel" name="cancelVar"/>
</variables>
<sequence>
- <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BuyerBrokerCallbackPT" variable="quoteListVar"/>
+ <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/>
+ <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/>
<if>
<sequence>
<scope>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="rejected" faultVariable="orderRejectedVar">
+ <catch faultMessageType="orderRejected" faultName="rejected" faultVariable="orderRejectedVar">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/>
</sequence>
</scope>
</sequence>
@@ -32,7 +35,7 @@
</sequence>
<else>
<sequence>
- <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/>
</sequence>
</else>
</if>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at CreditAgency.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,10 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker at CreditAgency" name="ESBBrokerProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common at CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/>
<partnerLinks>
- <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyServiceLT"/>
+ <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
@@ -9,17 +13,17 @@
</variables>
<sequence>
<pick>
- <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar">
+ <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar">
<sequence>
<scope>
<sequence>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/>
+ <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/>
+ <reply faultName="tns:invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierQuoteEngine.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierQuoteEngine.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierQuoteEngine.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,13 +1,15 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker at SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace=""/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierQuoteEnginePartnerLinkTypes.wsdl" namespace=""/>
<partnerLinks>
- <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/>
+ <partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="requestForQuote" name="requestForQuoteVar"/>
<variable messageType="quote" name="quoteVar"/>
</variables>
<sequence>
- <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="requestForQuoteVar"/>
- <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="quoteVar"/>
+ <receive createInstance="yes" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="requestForQuoteVar"/>
+ <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="quoteVar"/>
</sequence>
</process>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierTxnProcessor.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierTxnProcessor.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ESBBroker at SupplierTxnProcessor.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,16 +1,18 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker at SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace=""/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="SupplierTxnProcessorPartnerLinkTypes.wsdl" namespace=""/>
<partnerLinks>
- <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/>
+ <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="orderConfirmed" name="orderConfirmedVar"/>
<variable messageType="bookingReference" name="bookingReferenceVar"/>
</variables>
<sequence>
- <pick>
- <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="orderConfirmedVar">
+ <pick createInstance="yes">
+ <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="orderConfirmedVar">
<sequence>
- <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="bookingReferenceVar"/>
+ <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior" variable="bookingReferenceVar"/>
</sequence>
</onMessage>
</pick>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Buyer.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,21 +1,23 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods at Buyer" name="PurchaseGoodsProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing at Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
<partnerLinks>
- <partnerLink name="BuyerToStore" partnerLinkType="BuyerToStoreLT" partnerRole="StoreRequester"/>
+ <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
<variable messageType="BuyRequest" name="buyRequestVar"/>
<variable messageType="BuyConfirmed" name="buyConfirmedVar"/>
- <variable messageType="BuyFailed" name="buyFailedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="BuyFailed" faultName="BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="StorePT"/>
+ <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="tns:StoreBehavior"/>
</sequence>
</scope>
</sequence>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at CreditAgency.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at CreditAgency.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at CreditAgency.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,9 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods at CreditAgency" name="PurchaseGoodsProcess_CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common at CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CreditAgencyPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
<partnerLinks>
- <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyServiceLT"/>
+ <partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
@@ -8,14 +11,14 @@
<variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
</variables>
<sequence>
- <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"/>
+ <receive createInstance="yes" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckRequestVar"/>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/>
+ <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/>
+ <reply faultName="tns:CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Store.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Store.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/PurchaseGoods at Store.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,29 +1,31 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="PurchaseGoods at Store" name="PurchaseGoodsProcess_Store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:com.acme.purchasing" xmlns:tns="http://www.pi4soa.org/purchase" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Purchasing at Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.pi4soa.org/purchase" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/purchase"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="StorePartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/purchase"/>
<partnerLinks>
- <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="BuyerToStoreServiceLT"/>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ <partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="tns:BuyerToStoreServiceLT"/>
+ <partnerLink name="StoreToCreditAgency" partnerLinkType="tns:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
<variable messageType="BuyRequest" name="buyRequestVar"/>
<variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
<variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
<variable messageType="BuyConfirmed" name="buyConfirmedVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
<variable messageType="BuyFailed" name="buyFailedVar"/>
</variables>
<sequence>
- <receive operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyRequestVar"/>
+ <receive createInstance="yes" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="CreditCheckInvalid" faultName="CreditCheckFailed" faultVariable="creditCheckInvalidVar">
<sequence>
- <reply faultName="BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyFailedVar"/>
+ <reply faultName="tns:BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyFailedVar"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
- <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyConfirmedVar"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="tns:CreditAgencyBehavior"/>
+ <reply operation="buy" partnerLink="BuyerToStore" portType="tns:StoreBehavior" variable="buyConfirmedVar"/>
</sequence>
</scope>
</sequence>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Buyer.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Buyer.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Buyer.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,21 +1,22 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault at Buyer" name="ReqRespFaultProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="BuyerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/>
<partnerLinks>
- <partnerLink name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/>
+ <partnerLink name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerLT" partnerRole="SellerRequester"/>
</partnerLinks>
<variables>
<variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
<variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="insufficientCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="CreditCheckInvalid" faultName="insufficientCredit" faultVariable="creditCheckInvalidVar">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="SellerPT"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="tns:SellerBehavior"/>
</sequence>
</scope>
</sequence>
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Seller.bpel
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Seller.bpel 2009-11-15 09:51:13 UTC (rev 84)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/testmodels/ReqRespFault at Seller.bpel 2009-11-15 13:03:58 UTC (rev 85)
@@ -1,6 +1,8 @@
-<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ReqRespFault at Seller" name="ReqRespFaultProcess_Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess at Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="SellerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ReqRespFault"/>
<partnerLinks>
- <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="BuyerToSellerServiceLT"/>
+ <partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
@@ -8,14 +10,14 @@
<variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
</variables>
<sequence>
- <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckRequestVar"/>
+ <receive createInstance="yes" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckRequestVar"/>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckOkVar"/>
+ <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckInvalidVar"/>
+ <reply faultName="tns:insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
More information about the savara-commits
mailing list