[savara-commits] savara SVN: r522 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/generator and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Jan 1 18:51:43 EST 2011
Author: objectiser
Date: 2011-01-01 18:51:42 -0500 (Sat, 01 Jan 2011)
New Revision: 522
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
Log:
Fixed buyer projected example.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-01 20:06:27 UTC (rev 521)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-01 23:51:42 UTC (rev 522)
@@ -135,6 +135,14 @@
scope.setFaultHandlers(new TFaultHandlers());
context.getProperties().put(BPELDefinitions.BPEL_SCOPE_PROPERTY, scope);
+
+ seq.getActivity().add(scope);
+
+ seq = new TSequence();
+
+ scope.setSequence(seq);
+
+ context.setParent(seq);
}
TFaultHandlers fh=scope.getFaultHandlers();
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-01 20:06:27 UTC (rev 521)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-01 23:51:42 UTC (rev 522)
@@ -71,8 +71,10 @@
}
for (int i=0; ret &&
- i < choice.getPaths().size(); i++) {
+ i < choice.getWhens().size(); i++) {
+ ret = !InteractionUtil.isRequest(choice.getWhens().get(i));
+ /*
org.scribble.protocol.model.Block path=
choice.getPaths().get(i);
@@ -82,6 +84,7 @@
path.getContents().get(0))) {
ret = false;
}
+ */
}
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-01 20:06:27 UTC (rev 521)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-01 23:51:42 UTC (rev 522)
@@ -46,14 +46,15 @@
"SupplierTxnProcessor"));
suite.addTest(new ChoreographyToBPELTester("ESBBroker",
"SupplierQuoteEngine"));
+ */
+
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer"));
- */
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "CreditAgency"));
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Store"));
+ /*
+ */
/*
-
-
suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer"));
suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller"));
*/
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Buyer.bpel 2011-01-01 20:06:27 UTC (rev 521)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Buyer.bpel 2011-01-01 23:51:42 UTC (rev 522)
@@ -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">
+ <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" 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>
More information about the savara-commits
mailing list