[overlord-commits] Overlord SVN: r600 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: plugintest/org/jboss/tools/overlord/cdl/bpel/generator and 1 other directories.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2009-04-26 18:47:59 -0400 (Sun, 26 Apr 2009)
New Revision: 600

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/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
Log:
Fix reply in onMessage, to use same port type and partner link as the onMessage request.

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-26 21:12:45 UTC (rev 599)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java	2009-04-26 22:47:59 UTC (rev 600)
@@ -19,6 +19,7 @@
 
 import org.jboss.tools.overlord.cdl.bpel.model.*;
 import org.jboss.tools.overlord.cdl.bpel.model.component.*;
+import org.jboss.tools.overlord.cdl.bpel.model.util.InteractionUtil;
 import org.scribble.model.*;
 import org.scribble.model.change.*;
 import org.scribble.extensions.RegistryInfo;
@@ -174,15 +175,33 @@
 				onm.setActivity(seq);
 				
 				PartnerLink pl=new PartnerLink(bpelModel);
+				String portType=null;
 				
-				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 prevPLName=role.getName()+"To"+recv.getFromRole().getName();
+				
+				// Check if partner link already exists in
+				// other direction
+				PartnerLink prev=
+					bpelModel.getBPELProcess().getPartnerLink(prevPLName);
 
-				String portType = role.getName()+
-						recv.getFromRole().getName()+"CallbackPT";				
+				if (InteractionUtil.isRequest(recv) && prev == null) {
+					
+					pl.setMyRole(role.getName()+"Service");
+					//pl.setPartnerRole(interaction.getToRole().getName());
+					pl.setName(recv.getFromRole().getName()+"To"+role.getName());
+					pl.setPartnerLinkType(recv.getFromRole().getName()+"To"+role.getName()+"Service"+"LT");
 
+					portType = role.getName()+"PT";
+				} else {
+					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");
+
+					portType = role.getName()+
+							recv.getFromRole().getName()+"CallbackPT";				
+				}
+				
 				PartnerLink other=
 					bpelModel.getBPELProcess().getPartnerLink(pl.getName());
 

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java	2009-04-26 21:12:45 UTC (rev 599)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java	2009-04-26 22:47:59 UTC (rev 600)
@@ -51,7 +51,7 @@
         suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store"));
         suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer"));
         suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller"));
-
+        
         return suite;
     }
     

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel	2009-04-26 21:12:45 UTC (rev 599)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel	2009-04-26 22:47:59 UTC (rev 600)
@@ -1,11 +1,10 @@
 <process name="CompleteTransaction_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
     <partnerLinks>
         <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/>
-        <partnerLink myRole="SupplierTxnProcessorRequester" name="SupplierTxnProcessorToBroker" partnerLinkType="SupplierTxnProcessorToBrokerRequesterLT" partnerRole="BrokerService"/>
     </partnerLinks>
     <sequence>
         <pick>
-            <onMessage operation="confirm" partnerLink="SupplierTxnProcessorToBroker" portType="SupplierTxnProcessorBrokerCallbackPT">
+            <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT">
                 <sequence>
                     <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
                 </sequence>