[savara-commits] savara SVN: r534 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/parser and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Jan 5 12:12:54 EST 2011


Author: objectiser
Date: 2011-01-05 12:12:54 -0500 (Wed, 05 Jan 2011)
New Revision: 534

Added:
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.spr
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.spr
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.spr
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.spr
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD
Removed:
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.scv
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.scv
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.scv
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.scv
   branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/protocol/
Modified:
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel
   branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel
Log:
Update further testcases.

Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java	2011-01-05 17:12:54 UTC (rev 534)
@@ -34,15 +34,16 @@
         TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests");
         
         suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker at Broker"));
-        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker at Buyer"));
-        
+        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker at Buyer"));  
         suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker at CreditAgency"));
 
-        /*
         suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker at SupplierQuoteEngine"));
         suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker at SupplierTxnProcessor"));
+
         suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods at Buyer"));
         suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods at CreditAgency"));
+
+        /*
         suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods at Store"));
         suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault at Buyer"));
         suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault at Seller"));

Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.scv	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.scv	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,6 +0,0 @@
-namespace null;
-
-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

Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.spr	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierQuoteEngine.spr	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,4 @@
+protocol RequestForQuote_SupplierQuoteEngine @ SupplierBehavior {
+	getQuote(requestForQuote) from Broker;
+	getQuote(quote) to Broker;
+}

Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.scv	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.scv	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,8 +0,0 @@
-namespace null;
-
-conversation CompleteTransaction_SupplierTxnProcessor at SupplierTxnProcessor implements LoanBroker at SupplierTxnProcessor {
-	if {
-		confirm(orderConfirmed) from Broker to SupplierTxnProcessor;
-		confirm(bookingReference) from SupplierTxnProcessor to Broker;
-	}
-}
\ No newline at end of file

Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.spr	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ESBBroker at SupplierTxnProcessor.spr	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,4 @@
+protocol CompleteTransaction_SupplierTxnProcessor @ SupplierTxnProcessor {
+	confirm(orderConfirmed) from Broker;
+	confirm(bookingReference) to Broker;
+}

Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.scv	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.scv	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation PurchaseGoodsProcess_Buyer at Buyer implements Purchasing at Buyer {
-	buy(BuyRequest) from Buyer to Store;
-	if {
-		buy(BuyConfirmed) from Store to Buyer;
-	} else if {
-		buy(BuyFailed) from Store to Buyer;
-	}
-}
\ No newline at end of file

Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.spr	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at Buyer.spr	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,9 @@
+protocol PurchaseGoodsProcess_Buyer @ Buyer {
+	buy(BuyRequest) to Store;
+	choice from Store {
+		buy(BuyConfirmed):
+
+		buy(BuyFailed):
+
+	}
+}

Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.scv	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.scv	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation PurchaseGoodsProcess_CreditAgency at CreditAgency implements Common at CreditAgency {
-	checkCredit(CreditCheckRequest) from Store to CreditAgency;
-	if {
-		checkCredit(CreditCheckOk) from CreditAgency to Store;
-	} else if {
-		checkCredit(CreditCheckInvalid) from CreditAgency to Store;
-	}
-}
\ No newline at end of file

Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.spr	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods at CreditAgency.spr	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,9 @@
+protocol PurchaseGoodsProcess_CreditAgency @ CreditAgencyInterface {
+	checkCredit(CreditCheckRequest) from Store;
+	choice to Store {
+		checkCredit(CreditCheckOk):
+
+		checkCredit(CreditCheckInvalid):
+
+	}
+}

Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,20 +1,16 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" 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="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-    <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
-    <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
-    <partnerLinks>
-        <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
-    </partnerLinks>
-    <variables>
-        <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
-        <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
-    </variables>
-    <sequence>
-        <pick createInstance="yes">
-            <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar">
-                <sequence>
-                    <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/>
-                </sequence>
-            </onMessage>
-        </pick>
-    </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
+    <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <partnerLinks>
+        <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" myRole="SupplierTxnProcessor"/>
+    </partnerLinks>
+    <variables>
+        <variable name="confirmRequestVar" messageType="spr:confirmRequest"/>
+        <variable name="confirmResponseVar" messageType="spr:confirmResponse"/>
+    </variables>
+    <sequence>
+        <receive partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmRequestVar" createInstance="yes" name="Receive_orderConfirmed"/>
+        <reply partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmResponseVar" name="Send_bookingReference"/>
+    </sequence>
+</process>

Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,20 @@
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" 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="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+    <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+    <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+    <partnerLinks>
+        <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
+    </partnerLinks>
+    <variables>
+        <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
+        <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
+    </variables>
+    <sequence>
+        <pick createInstance="yes">
+            <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar">
+                <sequence>
+                    <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/>
+                </sequence>
+            </onMessage>
+        </pick>
+    </sequence>
+</process>

Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,24 +1,25 @@
-<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="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/>
-    <partnerLinks>
-        <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
-    </partnerLinks>
-    <variables>
-        <variable messageType="sto:buyRequest" name="buyRequestVar"/>
-        <variable messageType="sto:buyResponse" name="buyResponseVar"/>
-    </variables>
-    <sequence>
-        <scope>
-            <faultHandlers>
-                <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar">
-                    <sequence/>
-                </catch>
-            </faultHandlers>
-            <sequence>
-                <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/>
-            </sequence>
-        </scope>
-    </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+    <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="http://www.jboss.org/savara/examples" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <partnerLinks>
+        <partnerLink name="BuyerToStore" myRole="Buyer" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
+    </partnerLinks>
+    <variables>
+        <variable name="buyRequestVar" messageType="sto:buyRequest"/>
+        <variable name="buyResponseVar" messageType="sto:buyResponse"/>
+    </variables>
+    <sequence>
+        <scope>
+            <faultHandlers>
+                <catch faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar" faultMessageType="sto:BuyFailedFault">
+                    <sequence/>
+                </catch>
+            </faultHandlers>
+            <sequence>
+                <invoke partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_BuyRequest"/>
+            </sequence>
+        </scope>
+    </sequence>
+</process>

Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,24 @@
+<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="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/>
+    <partnerLinks>
+        <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
+    </partnerLinks>
+    <variables>
+        <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+        <variable messageType="sto:buyResponse" name="buyResponseVar"/>
+    </variables>
+    <sequence>
+        <scope>
+            <faultHandlers>
+                <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar">
+                    <sequence/>
+                </catch>
+            </faultHandlers>
+            <sequence>
+                <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/>
+            </sequence>
+        </scope>
+    </sequence>
+</process>

Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,26 +1,27 @@
-<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="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
-    <partnerLinks>
-        <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
-    </partnerLinks>
-    <variables>
-        <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
-        <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/>
-        <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/>
-    </variables>
-    <sequence>
-        <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/>
-        <if>
-            <sequence>
-                <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/>
-            </sequence>
-            <else>
-                <sequence>
-                    <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/>
-                </sequence>
-            </else>
-        </if>
-    </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing">
+    <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <partnerLinks>
+        <partnerLink name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" myRole="CreditAgencyInterface"/>
+    </partnerLinks>
+    <variables>
+        <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/>
+        <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/>
+        <variable name="CreditCheckFailedFaultVar" messageType="pur:CreditCheckFailedFault"/>
+    </variables>
+    <sequence>
+        <receive partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+        <if>
+            <sequence>
+                <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+            </sequence>
+            <else>
+                <sequence>
+                    <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid"/>
+                </sequence>
+            </else>
+        </if>
+    </sequence>
+</process>

Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,26 @@
+<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="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+    <partnerLinks>
+        <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
+    </partnerLinks>
+    <variables>
+        <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
+        <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/>
+        <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/>
+    </variables>
+    <sequence>
+        <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/>
+        <if>
+            <sequence>
+                <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/>
+            </sequence>
+            <else>
+                <sequence>
+                    <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/>
+                </sequence>
+            </else>
+        </if>
+    </sequence>
+</process>

Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel	2011-01-05 16:17:24 UTC (rev 533)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel	2011-01-05 17:12:54 UTC (rev 534)
@@ -1,15 +1,16 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" 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="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-    <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
-    <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
-    <partnerLinks>
-        <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/>
-    </partnerLinks>
-    <variables>
-        <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
-        <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
-    </variables>
-    <sequence>
-        <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/>
-        <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/>
-    </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+    <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngine.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+    <partnerLinks>
+        <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" myRole="SupplierBehavior"/>
+    </partnerLinks>
+    <variables>
+        <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/>
+        <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/>
+    </variables>
+    <sequence>
+        <receive partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteRequestVar" createInstance="yes" name="Receive_requestForQuote"/>
+        <reply partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteResponseVar" name="Send_quote"/>
+    </sequence>
+</process>

Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD	2011-01-05 17:12:54 UTC (rev 534)
@@ -0,0 +1,15 @@
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" 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="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+    <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+    <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+    <partnerLinks>
+        <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/>
+    </partnerLinks>
+    <variables>
+        <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
+        <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
+    </variables>
+    <sequence>
+        <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/>
+        <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/>
+    </sequence>
+</process>



More information about the savara-commits mailing list