[overlord-commits] Overlord SVN: r603 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: java/org/jboss/tools/overlord/cdl/bpel/model/component and 1 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Apr 28 17:12:16 EDT 2009
Author: objectiser
Date: 2009-04-28 17:12:16 -0400 (Tue, 28 Apr 2009)
New Revision: 603
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/java/org/jboss/tools/overlord/cdl/bpel/model/change/InteractionPatterns.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/java/org/jboss/tools/overlord/cdl/bpel/model/component/Variable.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Broker.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Buyer.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at CreditAgency.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.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
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Buyer.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at CreditAgency.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods 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
Log:
Added variable and namespace support. Interactions can now be typed based on the variable they reference.
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-27 22:32:30 UTC (rev 602)
+++ 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)
@@ -92,8 +92,9 @@
AbstractInteraction act=null;
PartnerLink pl=new PartnerLink(bpelModel);
Role role=null;
- String portType=null;
-
+ String portType=null;
+ String varName=InteractionPatterns.getVariableName(interaction);
+
if (interaction.getEnclosingDefinition() != null) {
role = interaction.getEnclosingDefinition().
getModelName().getLocatedRole();
@@ -128,24 +129,20 @@
act = new Invoke(bpelModel);
- //pl.setMyRole(role.getName());
pl.setPartnerRole(interaction.getToRole().getName()+"Requester");
pl.setName(role.getName()+"To"+interaction.getToRole().getName());
pl.setPartnerLinkType(role.getName()+"To"+interaction.getToRole().getName()+"LT");
portType = interaction.getToRole().getName()+"PT";
- // TODO: Need to deal with subsequent responses
- // which could be in a following choice - with each
- // choice path being a normal or fault response.
- // The faults need to be encoded in a fault handler
- // possibly wrapped around, or contained within the
- // invoke.
+ if (varName != null) {
+ ((Invoke)act).setInputVariable(varName);
+ }
+
} else {
act = new Reply(bpelModel);
pl.setMyRole(role.getName()+"Service");
- //pl.setPartnerRole(interaction.getToRole().getName());
pl.setName(interaction.getToRole().getName()+"To"+role.getName());
pl.setPartnerLinkType(interaction.getToRole().getName()+"To"+role.getName()+"Service"+"LT");
@@ -154,6 +151,10 @@
if (InteractionPatterns.isFaultResponse(interaction)) {
((Reply)act).setFaultName(InteractionPatterns.getFaultName(interaction));
}
+
+ if (varName != null) {
+ ((Reply)act).setVariable(varName);
+ }
}
} else if (InteractionPatterns.isResponseInFaultHandler(interaction) == false) {
@@ -181,6 +182,10 @@
portType = role.getName()+
interaction.getFromRole().getName()+"CallbackPT";
}
+
+ if (varName != null) {
+ ((Receive)act).setVariable(varName);
+ }
}
}
@@ -198,6 +203,7 @@
ret = true;
}
+ // Create partner link
PartnerLink other=
bpelModel.getBPELProcess().getPartnerLink(pl.getName());
if (other == null) {
@@ -213,6 +219,34 @@
}
}
+ // 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);
+ String namespace=InteractionPatterns.getMessageTypeNameSpace(interaction);
+
+ // 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);
+ }
+ }
+
+ // Set details on interaction
act.setPartnerLink(pl.getName());
act.setPortType(portType);
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-27 22:32:30 UTC (rev 602)
+++ 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)
@@ -169,11 +169,17 @@
context.setParent(parent);
- Interaction recv=InteractionPatterns.getPickPathInteraction(path); //(Interaction)acts.get(0);
+ Interaction recv=InteractionPatterns.getPickPathInteraction(path);
+ String varName=InteractionPatterns.getVariableName(recv);
+
OnMessage onm=new OnMessage(bpelModel);
onm.setActivity(seq);
+ if (varName != null) {
+ onm.setVariable(varName);
+ }
+
PartnerLink pl=new PartnerLink(bpelModel);
String portType=null;
@@ -202,6 +208,7 @@
recv.getFromRole().getName()+"CallbackPT";
}
+ // Create partner link
PartnerLink other=
bpelModel.getBPELProcess().getPartnerLink(pl.getName());
@@ -218,6 +225,34 @@
}
}
+ // 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(recv);
+ String namespace=InteractionPatterns.getMessageTypeNameSpace(recv);
+
+ // 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);
+ }
+ }
+
+ // Set details on interaction
onm.setPartnerLink(pl.getName());
onm.setPortType(portType);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/InteractionPatterns.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/InteractionPatterns.java 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/InteractionPatterns.java 2009-04-28 21:12:16 UTC (rev 603)
@@ -28,6 +28,8 @@
public class InteractionPatterns {
private static final String FAULT_NAME = "faultName";
+ private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart";
+ private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace";
/**
* This method checks whether the supplied interaction
@@ -312,6 +314,37 @@
getMessageSignature().getAnnotations().get(FAULT_NAME));
}
+ public static String getMessageTypeLocalPart(Interaction interaction) {
+ return((String)interaction.
+ getMessageSignature().getAnnotations().get(MESSAGE_TYPE_LOCALPART));
+ }
+
+ public static String getMessageTypeNameSpace(Interaction interaction) {
+ return((String)interaction.
+ getMessageSignature().getAnnotations().get(MESSAGE_TYPE_NAMESPACE));
+ }
+
+ public static String getVariableName(Interaction interaction) {
+ String varName=getMessageTypeLocalPart(interaction);
+
+ if (varName != null) {
+ int ind=varName.lastIndexOf('}');
+
+ if (ind != -1) {
+ varName = varName.substring(ind+1);
+ }
+
+ varName += "Var";
+
+ if (Character.isLowerCase(varName.charAt(0)) == false) {
+ varName = Character.toLowerCase(varName.charAt(0))+
+ varName.substring(1);
+ }
+ }
+
+ return(varName);
+ }
+
public static boolean isSyncNormalResponse(Interaction interaction) {
boolean ret=false;
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-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELProcess.java 2009-04-28 21:12:16 UTC (rev 603)
@@ -225,6 +225,58 @@
}
/**
+ * This method returns the prefix associated with the
+ * supplied namespace.
+ *
+ * @param namespace The namespace
+ * @return The prefix, or null if not found
+ */
+ public String getPrefix(String namespace) {
+ String ret=null;
+
+ org.w3c.dom.NamedNodeMap map=getDOMElement().getAttributes();
+
+ for (int i=0; ret == null && i < map.getLength(); i++) {
+ org.w3c.dom.Node node=map.item(i);
+
+ if (node instanceof org.w3c.dom.Attr) {
+ org.w3c.dom.Attr attr=(org.w3c.dom.Attr)node;
+
+ if (attr.getNodeValue().equals(namespace) &&
+ attr.getNodeName().startsWith("xmlns:")) {
+ ret = attr.getNodeName().substring(7);
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method adds a new namespace and returns the
+ * prefix allocated to it.
+ *
+ * @param namespace The namespace to be added
+ * @return The prefix
+ */
+ public String addNamespace(String namespace) {
+ String ret=getPrefix(namespace);
+ int i=1;
+
+ while (ret == null) {
+ String prefix="ns"+i;
+
+ if (getDOMElement().hasAttribute("xmlns:"+prefix) == false) {
+ ret = prefix;
+
+ getDOMElement().setAttribute(prefix, namespace);
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method adds a variable to the scope.
*
* @param var The variable to be added
@@ -309,6 +361,25 @@
}
/**
+ * This method returns the variable associated
+ * with the supplied name.
+ *
+ * @param name The name
+ * @return The variable, or null if not found
+ */
+ public Variable getVariable(String name) {
+ Variable ret=null;
+
+ for (int i=0; ret == null && i < m_variables.size(); i++) {
+ if (m_variables.get(i).getName().equals(name)) {
+ ret = m_variables.get(i);
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method sets the activity associated with
* the 'else' construct.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Variable.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Variable.java 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Variable.java 2009-04-28 21:12:16 UTC (rev 603)
@@ -34,6 +34,8 @@
private static final String NAME = "name";
private static final String TYPE = "type";
+ private static final String ELEMENT = "element";
+ private static final String MESSAGE_TYPE = "messageType";
/**
* The constructor for the element.
@@ -94,6 +96,44 @@
}
/**
+ * This method sets the variable element.
+ *
+ * @param element The element
+ */
+ public void setElement(String element) {
+ getDOMElement().setAttribute(ELEMENT, element);
+ }
+
+ /**
+ * This method returns the variable element.
+ *
+ * @return The element
+ */
+ public String getElement() {
+ return(getDOMElement().hasAttribute(ELEMENT)?
+ getDOMElement().getAttribute(ELEMENT):null);
+ }
+
+ /**
+ * This method sets the variable message type.
+ *
+ * @param type The message type
+ */
+ public void setMessageType(String type) {
+ getDOMElement().setAttribute(MESSAGE_TYPE, type);
+ }
+
+ /**
+ * This method returns the variable message type.
+ *
+ * @return The message type
+ */
+ public String getMessageType() {
+ return(getDOMElement().hasAttribute(MESSAGE_TYPE)?
+ getDOMElement().getAttribute(MESSAGE_TYPE):null);
+ }
+
+ /**
* This method validates the BPEL activity and reports warnings or
* errors to the supplied model listener.
*
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Broker.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Broker.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Broker.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -5,20 +5,31 @@
<partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
<partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
+ <variables>
+ <variable messageType="enquiry" name="enquiryVar"/>
+ <variable messageType="requestForQuote" name="requestForQuoteVar"/>
+ <variable messageType="quoteList" name="quoteListVar"/>
+ <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
+ <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
+ <variable messageType="bookingReference" name="bookingReferenceVar"/>
+ <variable messageType="orderRejected" name="orderRejectedVar"/>
+ <variable messageType="buy" name="buyVar"/>
+ <variable messageType="cancel" name="cancelVar"/>
+ </variables>
<sequence>
- <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="enquiryVar"/>
<while>
<sequence>
<scope>
<sequence>
- <invoke operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
+ <invoke inputVariable="requestForQuoteVar" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
</sequence>
</scope>
</sequence>
</while>
- <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="quoteListVar"/>
<pick>
- <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT">
+ <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="buyVar">
<sequence>
<scope>
<sequence>
@@ -26,21 +37,21 @@
<faultHandlers>
<catch faultName="invalidCredit">
<sequence>
- <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="orderRejectedVar"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- <invoke operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
- <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ <invoke inputVariable="orderConfirmedVar" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
+ <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="bookingReferenceVar"/>
</sequence>
</scope>
</sequence>
</scope>
</sequence>
</onMessage>
- <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT">
+ <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT" variable="cancelVar">
<sequence/>
</onMessage>
</pick>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Buyer.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Buyer.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at Buyer.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -2,9 +2,15 @@
<partnerLinks>
<partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="BuyerToBrokerLT" partnerRole="BrokerRequester"/>
</partnerLinks>
+ <variables>
+ <variable messageType="enquiry" name="enquiryVar"/>
+ <variable messageType="quoteList" name="quoteListVar"/>
+ <variable messageType="buy" name="buyVar"/>
+ <variable messageType="cancel" name="cancelVar"/>
+ </variables>
<sequence>
- <invoke operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BuyerBrokerCallbackPT"/>
+ <invoke inputVariable="enquiryVar" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BuyerBrokerCallbackPT" variable="quoteListVar"/>
<if>
<sequence>
<scope>
@@ -16,7 +22,7 @@
</catch>
</faultHandlers>
<sequence>
- <invoke operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke inputVariable="buyVar" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
</sequence>
</scope>
</sequence>
@@ -24,7 +30,7 @@
</sequence>
<else>
<sequence>
- <invoke operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <invoke inputVariable="cancelVar" operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/>
</sequence>
</else>
</if>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at CreditAgency.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at CreditAgency.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at CreditAgency.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -2,19 +2,24 @@
<partnerLinks>
<partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
+ <variables>
+ <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
+ </variables>
<sequence>
<pick>
- <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT">
+ <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar">
<sequence>
<scope>
<sequence>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -2,8 +2,12 @@
<partnerLinks>
<partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
+ <variables>
+ <variable messageType="requestForQuote" name="requestForQuoteVar"/>
+ <variable messageType="quote" name="quoteVar"/>
+ </variables>
<sequence>
- <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
- <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
+ <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="requestForQuoteVar"/>
+ <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT" variable="quoteVar"/>
</sequence>
</process>
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-27 22:32:30 UTC (rev 602)
+++ 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-28 21:12:16 UTC (rev 603)
@@ -2,11 +2,15 @@
<partnerLinks>
<partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
+ <variables>
+ <variable messageType="bookingReference" name="bookingReferenceVar"/>
+ <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
+ </variables>
<sequence>
<pick>
- <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT">
+ <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="orderConfirmedVar">
<sequence>
- <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
+ <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT" variable="bookingReferenceVar"/>
</sequence>
</onMessage>
</pick>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Buyer.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Buyer.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Buyer.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -2,6 +2,9 @@
<partnerLinks>
<partnerLink name="BuyerToStore" partnerLinkType="BuyerToStoreLT" partnerRole="StoreRequester"/>
</partnerLinks>
+ <variables>
+ <variable messageType="BuyRequest" name="buyRequestVar"/>
+ </variables>
<sequence>
<scope>
<faultHandlers>
@@ -10,7 +13,7 @@
</catch>
</faultHandlers>
<sequence>
- <invoke operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
+ <invoke inputVariable="buyRequestVar" operation="buy" 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 at CreditAgency.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at CreditAgency.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at CreditAgency.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -2,15 +2,20 @@
<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"/>
+ <receive operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckRequestVar"/>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
+ <reply operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
+ <reply faultName="CreditCheckFailed" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Store.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Store.bpel 2009-04-27 22:32:30 UTC (rev 602)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods at Store.bpel 2009-04-28 21:12:16 UTC (rev 603)
@@ -3,19 +3,25 @@
<partnerLink myRole="StoreService" name="BuyerToStore" partnerLinkType="BuyerToStoreServiceLT"/>
<partnerLink name="StoreToCreditAgency" partnerLinkType="StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
+ <variables>
+ <variable messageType="BuyRequest" name="buyRequestVar"/>
+ <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
+ <variable messageType="BuyConfirmed" name="buyConfirmedVar"/>
+ <variable messageType="BuyFailed" name="buyFailedVar"/>
+ </variables>
<sequence>
- <receive operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
+ <receive operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyRequestVar"/>
<scope>
<faultHandlers>
<catch faultName="CreditCheckFailed">
<sequence>
- <reply faultName="BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
+ <reply faultName="BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyFailedVar"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
- <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="CreditAgencyPT"/>
+ <reply operation="buy" partnerLink="BuyerToStore" portType="StorePT" variable="buyConfirmedVar"/>
</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 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-27 22:32:30 UTC (rev 602)
+++ 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-28 21:12:16 UTC (rev 603)
@@ -2,6 +2,9 @@
<partnerLinks>
<partnerLink name="BuyerToSeller" partnerLinkType="BuyerToSellerLT" partnerRole="SellerRequester"/>
</partnerLinks>
+ <variables>
+ <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
+ </variables>
<sequence>
<scope>
<faultHandlers>
@@ -10,7 +13,7 @@
</catch>
</faultHandlers>
<sequence>
- <invoke operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
+ <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
</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-27 22:32:30 UTC (rev 602)
+++ 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-28 21:12:16 UTC (rev 603)
@@ -2,15 +2,20 @@
<partnerLinks>
<partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="BuyerToSellerServiceLT"/>
</partnerLinks>
+ <variables>
+ <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
+ <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ </variables>
<sequence>
- <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
+ <receive operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckRequestVar"/>
<if>
<sequence>
- <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
+ <reply operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckOkVar"/>
</sequence>
<else>
<sequence>
- <reply faultName="insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT"/>
+ <reply faultName="insufficientCredit" operation="checkCredit" partnerLink="BuyerToSeller" portType="SellerPT" variable="creditCheckInvalidVar"/>
</sequence>
</else>
</if>
More information about the overlord-commits
mailing list