Author: objectiser Date: 2009-04-28 18:09:45 -0400 (Tue, 28 Apr 2009) New Revision: 604 Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.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/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(a)Broker.bpel cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Buyer.bpel cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Buyer.bpel cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)Buyer.bpel Log: Further variable work - on sync invoke. All needs more unit tests and refactoring to remove duplication, but will have to wait until more time :). Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-04-28 22:09:45 UTC (rev 604) @@ -161,6 +161,17 @@ if (InteractionPatterns.isSyncNormalResponse(interaction)) { //System.out.println("ADD RESP VAR TO PRECEDING"); + if (context.getParent() instanceof Sequence) { + java.util.List<BPELActivity> acts= + ((Sequence)context.getParent()).getActivities(); + + if (acts.size() > 0 && + acts.get(acts.size()-1) instanceof Invoke) { + Invoke invoke=(Invoke)acts.get(acts.size()-1); + + invoke.setOutputVariable(varName); + } + } } else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) { act = new Receive(bpelModel); 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-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-04-28 22:09:45 UTC (rev 604) @@ -121,6 +121,44 @@ c.setActivity(subseq); } else { subseq = seq; + + java.util.List<BPELActivity> acts= + ((Sequence)context.getParent()).getActivities(); + + if (acts.size() > 0 && act instanceof Interaction && + acts.get(acts.size()-1) instanceof Invoke) { + String varName=InteractionPatterns.getVariableName((Interaction)act); + Invoke invoke=(Invoke)acts.get(acts.size()-1); + + invoke.setOutputVariable(varName); + + // Create variable + if (varName != null) { + org.jboss.tools.overlord.cdl.bpel.model.component.Variable var= + bpelModel.getBPELProcess().getVariable(varName); + + if (var == null) { + var = new org.jboss.tools.overlord.cdl.bpel.model.component.Variable(bpelModel); + var.setName(varName); + + String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act); + String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act); + + // Find namespace prefix + if (namespace != null) { + String prefix=bpelModel.getBPELProcess().addNamespace(namespace); + + if (prefix != null) { + mesgType = prefix+":"+mesgType; + } + } + + var.setMessageType(mesgType); + + bpelModel.getBPELProcess().addVariable(var, -1); + } + } + } } Object parent=context.getParent(); 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-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-28 22:09:45 UTC (rev 604) @@ -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(a)Broker.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-04-28 22:09:45 UTC (rev 604) @@ -10,6 +10,7 @@ <variable messageType="requestForQuote" name="requestForQuoteVar"/> <variable messageType="quoteList" name="quoteListVar"/> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> + <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> <variable messageType="orderRejected" name="orderRejectedVar"/> @@ -22,7 +23,7 @@ <sequence> <scope> <sequence> - <invoke inputVariable="requestForQuoteVar" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/> + <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/> </sequence> </scope> </sequence> @@ -42,8 +43,8 @@ </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/> - <invoke inputVariable="orderConfirmedVar" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/> + <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/> <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="bookingReferenceVar"/> </sequence> </scope> Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Buyer.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Buyer.bpel 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)Buyer.bpel 2009-04-28 22:09:45 UTC (rev 604) @@ -6,6 +6,7 @@ <variable messageType="enquiry" name="enquiryVar"/> <variable messageType="quoteList" name="quoteListVar"/> <variable messageType="buy" name="buyVar"/> + <variable messageType="bookingReference" name="bookingReferenceVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> @@ -22,7 +23,7 @@ </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyVar" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/> + <invoke inputVariable="buyVar" operation="buy" outputVariable="bookingReferenceVar" partnerLink="BuyerToBroker" portType="BrokerPT"/> </sequence> </scope> </sequence> Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Buyer.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2009-04-28 22:09:45 UTC (rev 604) @@ -4,6 +4,7 @@ </partnerLinks> <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> + <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> </variables> <sequence> <scope> @@ -13,7 +14,7 @@ </catch> </faultHandlers> <sequence> - <invoke inputVariable="buyRequestVar" operation="buy" partnerLink="BuyerToStore" portType="StorePT"/> + <invoke inputVariable="buyRequestVar" operation="buy" outputVariable="buyConfirmedVar" partnerLink="BuyerToStore" portType="StorePT"/> </sequence> </scope> </sequence> Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)Store.bpel 2009-04-28 22:09:45 UTC (rev 604) @@ -6,6 +6,7 @@ <variables> <variable messageType="BuyRequest" name="buyRequestVar"/> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> + <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="BuyConfirmed" name="buyConfirmedVar"/> <variable messageType="BuyFailed" name="buyFailedVar"/> </variables> @@ -20,7 +21,7 @@ </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/> <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyConfirmedVar"/> </sequence> </scope> Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)Buyer.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2009-04-28 21:12:16 UTC (rev 603) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2009-04-28 22:09:45 UTC (rev 604) @@ -4,6 +4,7 @@ </partnerLinks> <variables> <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/> + <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> </variables> <sequence> <scope> @@ -13,7 +14,7 @@ </catch> </faultHandlers> <sequence> - <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BuyerToSeller" portType="SellerPT"/> </sequence> </scope> </sequence>