[overlord-commits] Overlord SVN: r592 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: java/org/jboss/tools/overlord/cdl/bpel/model/component and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Apr 22 17:10:53 EDT 2009
Author: objectiser
Date: 2009-04-22 17:10:53 -0400 (Wed, 22 Apr 2009)
New Revision: 592
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELProcess.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/EventHandler at Store.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Buyer.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Seller.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/EventHandler at Store.scv
Log:
Updated to generate partnerlink/porttype etc for the onMessage - and also process name attribute.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-04-22 21:10:53 UTC (rev 592)
@@ -94,6 +94,10 @@
// Check if root conversation
if (conv.getParent() instanceof Model) {
+ // Set the name of the process
+ bpelModel.getBPELProcess().setName(conv.getModelName().getName()+"_"+
+ conv.getModelName().getLocatedRole().getName());
+
// Add sequence to model
bpelModel.getBPELProcess().setActivity(seq);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-04-22 21:10:53 UTC (rev 592)
@@ -143,6 +143,13 @@
((Sequence)context.getParent()).addActivity(act, -1);
}
+ Role role=null;
+
+ if (elem.getEnclosingDefinition() != null) {
+ role = elem.getEnclosingDefinition().
+ getModelName().getLocatedRole();
+ }
+
for (int i=0; i < paths.size(); i++) {
Block path=paths.get(i);
@@ -161,11 +168,40 @@
context.setParent(parent);
+ Interaction recv=(Interaction)acts.get(0);
+
OnMessage onm=new OnMessage(bpelModel);
onm.setActivity(seq);
- Interaction recv=(Interaction)acts.get(0);
+ PartnerLink pl=new PartnerLink(bpelModel);
+ pl.setMyRole(role.getName()+"Requester");
+ pl.setPartnerRole(recv.getFromRole().getName()+"Service");
+ pl.setName(role.getName()+"To"+recv.getFromRole().getName());
+ pl.setPartnerLinkType(role.getName()+"To"+recv.getFromRole().getName()+"Requester"+"LT");
+
+ String portType = role.getName()+
+ recv.getFromRole().getName()+"CallbackPT";
+
+ PartnerLink other=
+ bpelModel.getBPELProcess().getPartnerLink(pl.getName());
+
+ if (other == null) {
+ bpelModel.getBPELProcess().addPartnerLink(pl, -1);
+ } else {
+ if (other.getPartnerRole() == null &&
+ pl.getPartnerRole() != null) {
+ other.setPartnerRole(pl.getPartnerRole());
+ }
+ if (other.getMyRole() == null &&
+ pl.getMyRole() != null) {
+ other.setMyRole(pl.getMyRole());
+ }
+ }
+
+ onm.setPartnerLink(pl.getName());
+ onm.setPortType(portType);
+
MessageSignature ms=recv.getMessageSignature();
if (ms.getOperation() != null) {
onm.setOperation(ms.getOperation());
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELProcess.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELProcess.java 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELProcess.java 2009-04-22 21:10:53 UTC (rev 592)
@@ -33,6 +33,7 @@
private static final long serialVersionUID = 3400962966628415184L;
public static final String PROCESS = "process";
+ public static final String NAME = "name";
/**
* The constructor for the activity.
@@ -205,6 +206,25 @@
}
/**
+ * This method sets the name.
+ *
+ * @param name The name
+ */
+ public void setName(String name) {
+ getDOMElement().setAttribute(NAME, name);
+ }
+
+ /**
+ * This method returns the name.
+ *
+ * @return The name
+ */
+ public String getName() {
+ return(getDOMElement().hasAttribute(NAME)?
+ getDOMElement().getAttribute(NAME):null);
+ }
+
+ /**
* This method adds a variable to the scope.
*
* @param var The variable to be added
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/EventHandler at Store.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/EventHandler at Store.bpel 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/EventHandler at Store.bpel 2009-04-22 21:10:53 UTC (rev 592)
@@ -1,22 +1,22 @@
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="EventHandler_Store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<partnerLinks>
<partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="BuyerToStoreServiceLT"/>
<partnerLink myRole="StoreRequester" name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<sequence>
<receive operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
- <invoke operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
- <if>
- <sequence>
- <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="StoreCreditAgencyCallbackPT"/>
- <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
- </sequence>
- <else>
+ <invoke operation="creditCheck" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
+ <pick>
+ <onMessage operation="checkCreditOk" partnerLink="StoreToCreditAgency" portType="StoreCreditAgencyCallbackPT">
<sequence>
- <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="StoreCreditAgencyCallbackPT"/>
<reply operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
</sequence>
- </else>
- </if>
+ </onMessage>
+ <onMessage operation="checkCreditInvalid" partnerLink="StoreToCreditAgency" portType="StoreCreditAgencyCallbackPT">
+ <sequence>
+ <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
+ </sequence>
+ </onMessage>
+ </pick>
</sequence>
</process>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Buyer.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Buyer.bpel 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Buyer.bpel 2009-04-22 21:10:53 UTC (rev 592)
@@ -1,22 +1,16 @@
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="ReqRespFaultProcess_Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<partnerLinks>
- <partnerLink myRole="BuyerRequester" name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/>
+ <partnerLink name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/>
</partnerLinks>
<sequence>
<scope>
- <faultHandlers/>
+ <faultHandlers>
+ <catch faultName="insufficientCredit">
+ <sequence/>
+ </catch>
+ </faultHandlers>
<sequence>
<invoke operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
- <if>
- <sequence>
- <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="BuyerSellerCallbackPT"/>
- </sequence>
- <else>
- <sequence>
- <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="BuyerSellerCallbackPT"/>
- </sequence>
- </else>
- </if>
</sequence>
</scope>
</sequence>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Seller.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Seller.bpel 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault at Seller.bpel 2009-04-22 21:10:53 UTC (rev 592)
@@ -1,4 +1,4 @@
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="ReqRespFaultProcess_Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<partnerLinks>
<partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="BuyerToSellerServiceLT"/>
</partnerLinks>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/EventHandler at Store.scv
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/EventHandler at Store.scv 2009-04-21 21:57:34 UTC (rev 591)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/testmodels/EventHandler at Store.scv 2009-04-22 21:10:53 UTC (rev 592)
@@ -1,11 +1,19 @@
namespace org.examples;
conversation EventHandler at Store {
- role CreditAgency;
+ role Buyer, CreditAgency;
+ buy(BuyInfo) from Buyer to Store request "buy";
+
+ creditCheck(CreditInformation) from Store to CreditAgency;
+
+ // No request/replyTo, so will be treated as invocations on a callback interface
+
if @ CreditAgency {
- checkCredit(CreditCheckOk) from CreditAgency to Store;
+ checkCreditOk(CreditCheckOk) from CreditAgency to Store;
+ buy(Confirmed) from Store to Buyer replyTo "buy";
} else if {
- checkCredit(CreditCheckInvalid) from CreditAgency to Store;
+ checkCreditInvalid(CreditCheckInvalid) from CreditAgency to Store;
+ buy(Rejected) from Store to Buyer replyTo "buy";
}
}
\ No newline at end of file
More information about the overlord-commits
mailing list