Author: objectiser
Date: 2009-06-18 17:37:10 -0400 (Thu, 18 Jun 2009)
New Revision: 645
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Else.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Elseif.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/If.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java
Log:
Support conversion of If/ElseIf/Else BPEL components to Conversation If construct.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Else.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Else.java 2009-06-16
21:11:01 UTC (rev 644)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Else.java 2009-06-18
21:37:10 UTC (rev 645)
@@ -56,8 +56,10 @@
@Override
public void convert(List<Activity> activities, ConversionContext context) {
- // TODO Auto-generated method stub
+ if (getActivity() != null) {
+ getActivity().convert(activities, context);
+ }
}
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Elseif.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Elseif.java 2009-06-16
21:11:01 UTC (rev 644)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Elseif.java 2009-06-18
21:37:10 UTC (rev 645)
@@ -65,8 +65,10 @@
@Override
public void convert(List<Activity> activities, ConversionContext context) {
- // TODO Auto-generated method stub
+ if (getActivity() != null) {
+ getActivity().convert(activities, context);
+ }
}
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/If.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/If.java 2009-06-16
21:11:01 UTC (rev 644)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/If.java 2009-06-18
21:37:10 UTC (rev 645)
@@ -17,6 +17,7 @@
*/
package org.jboss.tools.overlord.cdl.bpel.model.component;
+import org.scribble.conversation.model.ConditionalBlock;
import org.scribble.model.*;
import org.scribble.model.admin.ModelListener;
import org.apache.commons.logging.*;
@@ -101,6 +102,41 @@
*/
public void convert(java.util.List<Activity> activities,
ConversionContext context) {
+
+ org.scribble.conversation.model.If elem=
+ new org.scribble.conversation.model.If();
+
+ ConditionalBlock cb=new ConditionalBlock();
+
+ // TODO: Convert the conditional expression
+
+ if (getActivity() != null) {
+ getActivity().convert(cb.getContents(), context);
+ }
+
+ elem.getConditionalBlocks().add(cb);
+
+ // Convert 'else if' paths
+ for (int i=0; i < getElseIfPaths().size(); i++) {
+ Elseif elseIfElem=getElseIfPaths().get(i);
+
+ cb = new ConditionalBlock();
+
+ elseIfElem.convert(cb.getContents(), context);
+
+ elem.getConditionalBlocks().add(cb);
+ }
+
+ // Convert 'else' path
+ if (getElsePath() != null) {
+ cb = new ConditionalBlock();
+
+ getElsePath().convert(cb.getContents(), context);
+
+ elem.getConditionalBlocks().add(cb);
+ }
+
+ activities.add(elem);
}
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java 2009-06-16
21:11:01 UTC (rev 644)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/ParserTest.java 2009-06-18
21:37:10 UTC (rev 645)
@@ -34,6 +34,7 @@
TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests");
suite.addTest(new BPELToConversationTest("PurchaseGoods@Buyer"));
+ suite.addTest(new
BPELToConversationTest("PurchaseGoods@CreditAgency"));
suite.addTest(new BPELToConversationTest("PurchaseGoods@Store"));
return suite;
Added:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/results/PurchaseGoods(a)CreditAgency.scv 2009-06-18
21:37:10 UTC (rev 645)
@@ -0,0 +1,10 @@
+namespace null;
+
+conversation PurchaseGoodsProcess_CreditAgency@CreditAgency implements
PurchaseGoods@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:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel
(rev 0)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/parser/testmodels/PurchaseGoods(a)CreditAgency.bpel 2009-06-18
21:37:10 UTC (rev 645)
@@ -0,0 +1,23 @@
+<process
xmlns:ns0="http://www.scribble.org/conversation"
ns0:conversationType="PurchaseGoods@CreditAgency"
name="PurchaseGoodsProcess_CreditAgency"
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"...
+ <partnerLinks>
+ <partnerLink myRole="CreditAgencyService"
name="StoreToCreditAgency"
partnerLinkType="StoreToCreditAgencyServiceLT"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
+ <variable messageType="CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ </variables>
+ <sequence>
+ <receive operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"
variable="creditCheckRequestVar"/>
+ <if>
+ <sequence>
+ <reply operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"
variable="creditCheckOkVar"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply faultName="CreditCheckFailed"
operation="checkCredit" partnerLink="StoreToCreditAgency"
portType="CreditAgencyPT" variable="creditCheckInvalidVar"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>