Author: objectiser
Date: 2011-01-04 08:44:12 -0500 (Tue, 04 Jan 2011)
New Revision: 528
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/ESBBroker(a)SupplierQuoteEngine.bpel
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
Log:
Updated cdm to protocol parser, to ensure that roles are not reused in interactions, as
this resets the parent link. We need to use their declared location to determine the
projection scope.
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-04
11:55:42 UTC (rev 527)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04
13:44:12 UTC (rev 528)
@@ -52,9 +52,9 @@
suite.addTest(new ChoreographyToBPELTester("ESBBroker",
"Broker"));
- /*
suite.addTest(new ChoreographyToBPELTester("ESBBroker",
"SupplierQuoteEngine"));
+ /*
*/
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods",
"Buyer"));
@@ -63,7 +63,7 @@
suite.addTest(new ChoreographyToBPELTester("ReqRespFault",
"Buyer"));
suite.addTest(new ChoreographyToBPELTester("ReqRespFault",
"Seller"));
-
+
return suite;
}
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-04
11:55:42 UTC (rev 527)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-04
13:44:12 UTC (rev 528)
@@ -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@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">
+ <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>
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-04
11:55:42 UTC (rev 527)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-04
13:44:12 UTC (rev 528)
@@ -186,10 +186,10 @@
getWhens().addAll(blocks);
((org.scribble.protocol.model.Choice)ret).
- setFromRole(fromRole);
+ setFromRole(new Role(fromRole));
if (toRoles.size() == 1) {
- ((org.scribble.protocol.model.Choice)ret).setToRole(toRoles.get(0));
+ ((org.scribble.protocol.model.Choice)ret).setToRole(new Role(toRoles.get(0)));
} else if (toRoles.size() == 0) {
// TODO: Report no to roles
} else {
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-04
11:55:42 UTC (rev 527)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-04
13:44:12 UTC (rev 528)
@@ -90,11 +90,11 @@
block.setMessageSignature(ms);
- ret.setFromRole(InteractionConverterRuleImpl.getFromRole(context,
- ed));
+ ret.setFromRole(new Role(InteractionConverterRuleImpl.getFromRole(context,
+ ed)));
- ret.setFromRole(InteractionConverterRuleImpl.getToRole(context,
- ed));
+ ret.setToRole(new Role(InteractionConverterRuleImpl.getToRole(context,
+ ed)));
}
}
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-04
11:55:42 UTC (rev 527)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-04
13:44:12 UTC (rev 528)
@@ -351,8 +351,8 @@
getInterfaceName(cdl));
}
- interaction.setFromRole(getFromRole(context, details));
- interaction.getToRoles().add(getToRole(context, details));
+ interaction.setFromRole(new Role(getFromRole(context, details)));
+ interaction.getToRoles().add(new Role(getToRole(context, details)));
if (details.getAction() == ExchangeActionType.REQUEST) {