Overlord SVN: r604 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: plugintest/org/jboss/tools/overlord/cdl/bpel/generator and 1 other directories.
by overlord-commits＠lists.jboss.org
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>
15 years, 2 months
- 1
- 0
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.
by overlord-commits＠lists.jboss.org
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(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/ESBBroker(a)CreditAgency.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.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)CreditAgency.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
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)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(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-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(a)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(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-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(a)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(a)CreditAgency.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)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(a)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(a)SupplierQuoteEngine.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)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(a)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(a)SupplierTxnProcessor.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)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(a)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(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-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(a)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(a)CreditAgency.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoods(a)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(a)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(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-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(a)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(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-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(a)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(a)Seller.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ReqRespFault(a)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(a)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>
15 years, 2 months
- 1
- 0
Overlord SVN: r602 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: java/org/jboss/tools/overlord/cdl/bpel/model/util and 1 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-04-27 18:32:30 -0400 (Mon, 27 Apr 2009)
New Revision: 602
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/util/InteractionUtil.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)CreditAgency.bpel
Log:
Cater for synchronous response, and pick with mutually exclusive receives.
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 08:05:58 UTC (rev 601)
+++ 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)
@@ -156,24 +156,31 @@
}
}
} else if (InteractionPatterns.isResponseInFaultHandler(interaction) == false) {
- act = new Receive(bpelModel);
-
- if (InteractionUtil.isRequest(interaction)) {
+
+ if (InteractionPatterns.isSyncNormalResponse(interaction)) {
+
+ //System.out.println("ADD RESP VAR TO PRECEDING");
+
+ } else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) {
+ act = new Receive(bpelModel);
- pl.setMyRole(role.getName()+"Service");
- //pl.setPartnerRole(interaction.getToRole().getName());
- pl.setName(interaction.getFromRole().getName()+"To"+role.getName());
- pl.setPartnerLinkType(interaction.getFromRole().getName()+"To"+role.getName()+"Service"+"LT");
-
- portType = role.getName()+"PT";
- } else {
- pl.setMyRole(role.getName()+"Requester");
- pl.setPartnerRole(interaction.getFromRole().getName()+"Service");
- pl.setName(role.getName()+"To"+interaction.getFromRole().getName());
- pl.setPartnerLinkType(role.getName()+"To"+interaction.getFromRole().getName()+"Requester"+"LT");
-
- portType = role.getName()+
- interaction.getFromRole().getName()+"CallbackPT";
+ if (InteractionUtil.isRequest(interaction)) {
+
+ pl.setMyRole(role.getName()+"Service");
+ //pl.setPartnerRole(interaction.getToRole().getName());
+ pl.setName(interaction.getFromRole().getName()+"To"+role.getName());
+ pl.setPartnerLinkType(interaction.getFromRole().getName()+"To"+role.getName()+"Service"+"LT");
+
+ portType = role.getName()+"PT";
+ } else {
+ pl.setMyRole(role.getName()+"Requester");
+ pl.setPartnerRole(interaction.getFromRole().getName()+"Service");
+ pl.setName(role.getName()+"To"+interaction.getFromRole().getName());
+ pl.setPartnerLinkType(role.getName()+"To"+interaction.getFromRole().getName()+"Requester"+"LT");
+
+ portType = role.getName()+
+ interaction.getFromRole().getName()+"CallbackPT";
+ }
}
}
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 08:05:58 UTC (rev 601)
+++ 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)
@@ -163,13 +163,13 @@
context.setParent(seq);
- for (int j=1; j < acts.size(); j++) {
+ for (int j=0; j < acts.size(); j++) {
context.insert(model, acts.get(j), null);
}
context.setParent(parent);
- Interaction recv=(Interaction)acts.get(0);
+ Interaction recv=InteractionPatterns.getPickPathInteraction(path); //(Interaction)acts.get(0);
OnMessage onm=new OnMessage(bpelModel);
onm.setActivity(seq);
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 08:05:58 UTC (rev 601)
+++ 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)
@@ -128,13 +128,11 @@
for (int i=0; i < paths.size(); i++) {
if (paths.get(i).getContents().size() > 0) {
- org.scribble.model.Activity sub=
- paths.get(i).getContents().get(0);
+ Interaction in=getPickPathInteraction(paths.get(i));
- if (sub instanceof Interaction &&
- InteractionUtil.isRequest((Interaction)sub) == false &&
- ((Interaction)sub).getReplyToLabel() != null &&
- ((Interaction)sub).getReplyToLabel().equals(requestLabel)) {
+ if (in != null &&
+ InteractionUtil.isResponse(in) &&
+ in.getReplyToLabel().equals(requestLabel)) {
matched++;
}
}
@@ -150,6 +148,84 @@
return(ret);
}
+ /**
+ * This method obtains the interaction that triggers a
+ * specified path in a BPEL pick activity.
+ *
+ * @param path The path
+ * @return The interaction that triggers the path in
+ * the pick activity
+ */
+ public static Interaction getPickPathInteraction(Block path) {
+ Interaction ret=null;
+
+ // TODO: This method is the opposite of the
+ // 'isInteractionPickPathTrigger', so needs to be
+ // updated to reflect any changes to that method
+
+ if (path.getContents().size() > 0) {
+ org.scribble.model.Activity sub=
+ path.getContents().get(0);
+
+ // Check if scope
+ if (sub instanceof Compose) {
+ Definition defn=((Compose)sub).getDefinition();
+ org.scribble.model.Behaviour b=null;
+
+ for (int j=0; b == null &&
+ j < defn.getBlock().getContents().size(); j++) {
+ if (defn.getBlock().getContents().get(j) instanceof org.scribble.model.Behaviour) {
+ b = (org.scribble.model.Behaviour)
+ defn.getBlock().getContents().get(j);
+ }
+ }
+
+ if (b != null) {
+ sub = b;
+ }
+ }
+
+ if (sub instanceof Interaction) {
+ ret = (Interaction)sub;
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is the trigger interaction within a BPEL pick activity.
+ *
+ * @param in The interaction
+ * @return Whether the interaction is a pick trigger activity
+ */
+ public static boolean isInteractionPickPathTrigger(Interaction in) {
+ boolean ret=false;
+
+ // TODO: Need to determine all situations and ensure
+ // is generic enough to cope with extensions to Scribble
+ // model
+
+ Block path=(Block)in.getParent();
+
+ if (path.getParent() instanceof If &&
+ InteractionPatterns.isSwitch((If)path.getParent())) {
+ ret = true;
+
+ // Check if receive is directly contained within a
+ // sub-definition
+ } else if (InteractionUtil.isSend(in) == false &&
+ path.getParent() instanceof org.scribble.model.Definition &&
+ path.getParent().getParent() instanceof Block &&
+ path.getParent().getParent().getParent() instanceof
+ org.scribble.model.Definition) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
public static boolean isSwitch(If choice) {
boolean ret=false;
@@ -159,11 +235,10 @@
for (int i=0; i < paths.size(); i++) {
if (paths.get(i).getContents().size() > 0) {
- org.scribble.model.Activity sub=
- paths.get(i).getContents().get(0);
+ Interaction in=getPickPathInteraction(paths.get(i));
- if (sub instanceof Interaction &&
- InteractionUtil.isSend((Interaction)sub) == false) {
+ if (in != null &&
+ InteractionUtil.isSend(in) == false) {
matched++;
}
}
@@ -236,4 +311,37 @@
return((String)interaction.
getMessageSignature().getAnnotations().get(FAULT_NAME));
}
+
+ public static boolean isSyncNormalResponse(Interaction interaction) {
+ boolean ret=false;
+
+ if (InteractionUtil.isResponse(interaction) &&
+ interaction.getParent() instanceof Block) {
+ Block block=(Block)interaction.getParent();
+
+ int pos=block.getContents().indexOf(interaction);
+
+ if (pos > 0 && block.getContents().get(pos-1) instanceof Interaction) {
+ Interaction req=(Interaction)block.getContents().get(pos-1);
+
+ ret = isResponseForRequest(interaction, req);
+ }
+ }
+
+ return(ret);
+ }
+
+ public static boolean isResponseForRequest(Interaction resp,
+ Interaction req) {
+ boolean ret=false;
+
+ if (InteractionUtil.isRequest(req) &&
+ InteractionUtil.isResponse(resp) &&
+ resp.getReplyToLabel().equals(
+ req.getRequestLabel())) {
+ ret = true;
+ }
+
+ return(ret);
+ }
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java 2009-04-27 08:05:58 UTC (rev 601)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/util/InteractionUtil.java 2009-04-27 22:32:30 UTC (rev 602)
@@ -70,4 +70,20 @@
return(ret);
}
+ /**
+ * This method determines whether the supplied interaction
+ * is a response.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a response
+ */
+ public static boolean isResponse(Interaction interaction) {
+ boolean ret=false;
+
+ if (interaction.getReplyToLabel() != null) {
+ ret = true;
+ }
+
+ return(ret);
+ }
}
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-27 08:05:58 UTC (rev 601)
+++ 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-27 22:32:30 UTC (rev 602)
@@ -1,9 +1,9 @@
<process name="ESBBrokerProcess_Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<partnerLinks>
<partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="BuyerToBrokerServiceLT"/>
- <partnerLink myRole="BrokerRequester" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
+ <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
<partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- <partnerLink myRole="BrokerRequester" name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
+ <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<sequence>
<receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
@@ -12,40 +12,37 @@
<scope>
<sequence>
<invoke operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
- <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="BrokerSupplierQuoteEngineCallbackPT"/>
</sequence>
</scope>
</sequence>
</while>
<reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <if>
- <sequence>
- <scope>
- <sequence>
- <receive operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- <scope>
- <faultHandlers>
- <catch faultName="invalidCredit">
- <sequence>
- <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- </sequence>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- <invoke operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
- <receive operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="BrokerSupplierTxnProcessorCallbackPT"/>
- <reply operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
- </sequence>
- </scope>
- </sequence>
- </scope>
- </sequence>
- <else>
+ <pick>
+ <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT">
<sequence>
- <receive operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ <scope>
+ <sequence>
+ <scope>
+ <faultHandlers>
+ <catch faultName="invalidCredit">
+ <sequence>
+ <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT"/>
+ </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"/>
+ </sequence>
+ </scope>
+ </sequence>
+ </scope>
</sequence>
- </else>
- </if>
+ </onMessage>
+ <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT">
+ <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/ESBBroker(a)CreditAgency.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2009-04-27 08:05:58 UTC (rev 601)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2009-04-27 22:32:30 UTC (rev 602)
@@ -3,24 +3,25 @@
<partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<sequence>
- <if>
- <sequence>
- <scope>
- <sequence>
- <receive operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- <if>
- <sequence>
- <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
- </sequence>
- <else>
+ <pick>
+ <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT">
+ <sequence>
+ <scope>
+ <sequence>
+ <if>
<sequence>
- <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ <reply operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
</sequence>
- </else>
- </if>
- </sequence>
- </scope>
- </sequence>
- </if>
+ <else>
+ <sequence>
+ <reply faultName="invalidCredit" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="CreditAgencyPT"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+ </scope>
+ </sequence>
+ </onMessage>
+ </pick>
</sequence>
</process>
15 years, 2 months
- 1
- 0
Overlord SVN: r601 - in cdl/trunk/docs/docbook/userguide/src/main: module and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-04-27 04:05:58 -0400 (Mon, 27 Apr 2009)
New Revision: 601
Added:
cdl/trunk/docs/docbook/userguide/src/main/module/stateless-conversation-aware-esb.xml
Modified:
cdl/trunk/docs/docbook/userguide/src/main/master.xml
Log:
* Add the stateless esb actions document.
Modified: cdl/trunk/docs/docbook/userguide/src/main/master.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/master.xml 2009-04-26 22:47:59 UTC (rev 600)
+++ cdl/trunk/docs/docbook/userguide/src/main/master.xml 2009-04-27 08:05:58 UTC (rev 601)
@@ -14,5 +14,5 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/overview.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/conversation-validation-with-cdl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/conversation-aware-esb.xml"/>
-
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/stateless-conversation-aware-esb.xml"/>
</book>
Added: cdl/trunk/docs/docbook/userguide/src/main/module/stateless-conversation-aware-esb.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/module/stateless-conversation-aware-esb.xml (rev 0)
+++ cdl/trunk/docs/docbook/userguide/src/main/module/stateless-conversation-aware-esb.xml 2009-04-27 08:05:58 UTC (rev 601)
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+]>
+<chapter id="statelessconversationawareesb">
+ <title>Stateless ESB Actions</title>
+ <section>
+
+ <title>Stateless ESB Actions</title>
+ <section>
+ <title>Overview</title>
+ <para>
+After the M1 release, we've found some problems in the conversation aware esb actions approach, mainly due to its complexity.
+Therefore, we've introduced the Stateless conversation ESB actions, which we will see it later on.
+With this new approach, users can still validate the message exchange in the runtime, but it doesn't need us to store
+the state. So it simplified a lot without losing its functionality.
+ </para>
+
+ </section>
+
+ <section>
+ <title>Interaction</title>
+ <para>
+Firstly, let's see the two basic actions for interaction.
+Services interact by sending and receiving messages, whether synchronously or asynchronously.
+ </para>
+ <para>
+JBossESB is designed to anonymously handle inbound messages (possibly requests), without explicitly defining restrictions on message type, and then optionally returning responses (again without explicitly defining the response message type).
+ </para>
+ <para>
+Although this is sufficient for a runtime mechanism, where issues related to unexpected message types can be handled with suitable exceptions/faults, it does not enable the communication type structure to be understood by examination of the JBossESB configuration.
+ </para>
+
+ <section>
+ <title>Sending a message</title>
+ <para>
+When sending a message, the first thing to consider is the type of the message. This can be declared as a property on the <emphasis>SendMessageAction</emphasis>.
+If dealing with RPC style interactions, then we may also want to optionally specify an operation name.
+ </para>
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction"
+ process="process" name="...">
+ <property name="operation" value="getQuote" />
+ <property name="messageType" value="requestForQuote" />
+ ....
+ </action>
+ ]]></programlisting>
+ </informalexample>
+
+ <itemizedlist>
+ <listitem>
+Sending a request
+ <para>
+When sending a request, we need to identify the destination service category/name. This is done by either specifying the category and name explicitly, using the <emphasis>serviceCategory</emphasis> and <emphasis>serviceName</emphasis> properties:
+ </para>
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction"
+ process="process" name="...">
+ ....
+ <property name="serviceName" value="RequestForQuote.main" />
+ <property name="serviceCategory" value="ESBBroker.SupplierParticipant" />
+ ....
+ </action>
+ ]]></programlisting>
+ </informalexample>
+
+ </listitem>
+
+ <listitem>
+Sending a response
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction"
+ process="process" name="...">
+ ....
+ <property name="clientRole" value="buyer" />
+ <property name="storageClass" value="orgization.your.impl.EPRStorageImpl" />
+ ....
+ </action>
+ ]]></programlisting>
+ </informalexample>
+ <para>
+When sending a response, the destination will not be directly available. The destination would have been received as a 'reply to' EPR (Endpoint Reference) in a previously received request (see <emphasis>ReceiveMessageAction</emphasis> for details of how to store the 'reply to' EPR).
+Therefore, to indicate which EPR to respond to, a property called 'clientEPR' is specified with the name of the stored EPR. This must match up to a previously stored EPR name within a <emphasis>ReceiveMessageAction</emphasis>.
+ </para>
+ <para>
+The value of <emphasis>storageClass</emphasis> should be a class that implements the <emphasis>org.jboss.soa.overlord.jbossesb.EPRStorage</emphasis> interface, basically this class is responsible for registering, getting EPR from roleName.
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ </section>
+
+ <section>
+ <title>Receiving a message</title>
+
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.ReceiveMessageAction"
+ process="process" name="s1-2">
+ <property name="operation" value="makeEnquiry" />
+ <property name="messageType" value="enquiry" />
+ <property name="clientRole" value="buyer" />
+ <property name="storageClass" value="com.acme.services.creditAgency.MemoryEPRStorage" />
+ </action>
+ ]]></programlisting>
+ </informalexample>
+
+ <para>
+The <emphasis>ReceiveMessageAction</emphasis> is used to explicitly define the message type that should be received.
+If an RPC style has been used, then the optional operation name can also be defined.
+ </para>
+ <para>
+Unlike the <emphasis>SendMessageAction</emphasis>, which will actually send a message to the specified service category/name,
+the <emphasis>ReceiveMessageAction</emphasis> primarily serves to provide explicit details about the expected message and to perform any relevant validation of the message content. If an incorrect message type is received, then an error will be logged.
+ </para>
+ <para>
+The optional 'cliengRole' and 'storageClass' properties are used to store any specific "reply to" EPR (associated with the message) against the specified name. This makes the EPR accessible to any subsequent <emphasis>SendMessageAction</emphasis> activities that need to return a response or send a notification.
+ </para>
+ </section>
+ </section>
+
+ <section>
+ <title>Controlling Flow</title>
+ <para>
+This section describes the two control flow mechanisms that are supported by the stateless ESB actions.
+ </para>
+ <para>
+The default control flow, supported natively by the ESB action pipeline design, is a sequence. As the name implies, the actions are performed one at a time in the order they defined in the action pipeline, i.e. in a sequence.
+ </para>
+
+ <section>
+ <title>Selecting paths based on a decision</title>
+ <para>
+The action associated with the 'selection of a path based on a decision' is the <emphasis>IfAction</emphasis>. An example of this construct is:
+ </para>
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.IfAction" name="..." process="process">
+ <property name="paths">
+ <if service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision1" decision-class="org.jboss.soa.overlord.jbossesb.TestDecision"/>
+ <elseif service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision2" decision-class="org.jboss.soa.overlord.jbossesb.Test2ndDecision"/>
+ <else service-category="PurchaseGoods.CreditAgency" service-name="CreditAgency.decision3"/>
+ </property>
+ </action>
+ ]]></programlisting>
+ </informalexample>
+ <para>
+This construct defines a 'path' property with one or more elements, representing the <emphasis>if</emphasis>, <emphasis>elseif</emphasis> and <emphasis>else</emphasis> aspects of the traditional if/else construct. Only the <emphasis>if</emphasis> element is mandatory, and can be followed by zero or more <emphasis>elseif</emphasis> elements before ending with the optional <emphasis>else</emphasis> element.
+ </para>
+ <para>
+The <emphasis>if</emphasis> and <emphasis>elseif</emphasis> elements can define an 'decision-class' attribute to be evaluated at runtime, to determine if the associated 'service-category' and 'service-name' should be invoked.
+the value of decision-class must implement the interface of <emphasis>org.jboss.soa.overlord.jbossesb.Decision</emphasis>.
+ </para>
+ </section>
+
+ <section>
+ <title>Message router action</title>
+ <para>
+The action used to select paths based on a received message type is <emphasis>SwitchAction</emphasis>.
+In the stateless esb actions approach, we are using this as the <emphasis>Message Router</emphasis>.
+The configuration of <emphasis>SwithAction</emphasis> is like:
+ </para>
+ <informalexample>
+ <programlisting role="XML" ><![CDATA[
+ <action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SwitchAction" name="..." process="process">
+ <property name="serviceDescriptionName" value="{org.pi4soa.esbbroker.esbbroker}ESBBrokerProcess-Broker"/>
+ <property name="conversationType" value="overlord.cdl.samples.LoanBroker@Broker"/>
+ <property name="paths">
+ <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__1">
+ <message type="enquiry"/>
+ </case>
+ <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__7">
+ <event description="Event trigger to send quoteList message type(s)"/>
+ </case>
+ <case service-category="org.pi4soa.esbbroker.esbbroker" service-name="ESBBrokerProcess_Broker__8">
+ <message type="buy"/>
+ </case>
+ </property>
+ </action>
+ ]]></programlisting>
+ </informalexample>
+ <para>
+In this approach, the <emphasis>SwitchAction</emphasis> typically is the point of contact for other services. Also true for the internal services.
+
+ </para>
+ <para>
+The 'paths' property defines one or more 'case' elements. These elements identify a service category and name that should be invoked upon receipt of one or more message types, as specified by 'message' elements contained within the 'case' elements.
+ </para>
+ <para>
+The 'type' attribute on the 'message' element defines the type of message that can be routed to the specified service category/name. In the example above, the message types have no namespace.
+However if they have a namespace, this can be defined in curly braces, e.g. "{http://www.jboss.org/samples}buy".
+ </para>
+ <para>
+the 'event' attribute for paths with no associated message type.
+ </para>
+ <para>
+Once a path has been selected, the associated service category/name will be invoked immediately.
+If none of the paths specified within this action are relevant to the received message, then a runtime exception will be thrown.
+ </para>
+ </section>
+
+ </section>
+
+ <tip>
+ In this M2 release, we've just had these four actions in the stateless esb action approach.
+ we might add other actions in the subsequent release. If you have any comments and feedback, you can go to the forum or issue track to raise your request.
+ </tip>
+
+ </section>
+</chapter>
+
15 years, 2 months
- 1
- 0
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.
by overlord-commits＠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(a)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(a)SupplierTxnProcessor.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)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(a)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>
15 years, 2 months
- 1
- 0
Overlord SVN: r599 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-04-26 17:12:45 -0400 (Sun, 26 Apr 2009)
New Revision: 599
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.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)SupplierQuoteEngine.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
Log:
Update tests for sub-definitions, to reduce the scope associated with the interactions.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-26 21:12:45 UTC (rev 599)
@@ -29,8 +29,6 @@
import org.scribble.model.admin.ModelInfo;
import org.scribble.model.admin.ModelRepository;
import org.scribble.model.change.ModelGenerator;
-import org.w3c.dom.Node;
-import org.eclipse.jdt.core.*;
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
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 17:53:56 UTC (rev 598)
+++ 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)
@@ -28,23 +28,30 @@
import org.pi4soa.scribble.cdm.model.CDMNotation;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.ModelReference;
+import org.scribble.model.SubDefinitionPath;
import org.scribble.model.change.ModelGenerator;
public class GeneratorTest extends TestCase {
public static TestSuite suite() {
- TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests");
+ TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests");
+
suite.addTest(new ConversationToBPELTest("EventHandler@Store"));
suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker"));
suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer"));
suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency"));
- suite.addTest(new ChoreographyToBPELTest("ESBBroker", "SupplierTxnProcessor"));
- suite.addTest(new ChoreographyToBPELTest("ESBBroker", "SupplierQuoteEngine"));
+ suite.addTest(new ChoreographyToBPELTest("ESBBroker",
+ new SubDefinitionPath(new String[]{"CompleteTransaction"}),
+ "SupplierTxnProcessor"));
+ suite.addTest(new ChoreographyToBPELTest("ESBBroker",
+ new SubDefinitionPath(new String[]{"RequestForQuote"}),
+ "SupplierQuoteEngine"));
suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Buyer"));
suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "CreditAgency"));
suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store"));
suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer"));
suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller"));
+
return suite;
}
@@ -187,13 +194,29 @@
* @param name The test name
* @param role The role
*/
- public ChoreographyToBPELTest(String name, String role) {
+ public ChoreographyToBPELTest(String name,
+ String role) {
super(name+"@"+role);
m_name = name;
m_role = role;
}
/**
+ * This constructor is initialized with the test
+ * name.
+ *
+ * @param name The test name
+ * @param role The role
+ */
+ public ChoreographyToBPELTest(String name,
+ SubDefinitionPath sdp, String role) {
+ super(name+sdp.toString()+"@"+role);
+ m_name = name;
+ m_subDefinitionPath = sdp;
+ m_role = role;
+ }
+
+ /**
* This method runs the test.
*
* @param result The test result
@@ -228,7 +251,8 @@
new org.scribble.model.Role(m_role);
org.scribble.model.Model projected=
- projector.project(ref, model, role, l);
+ projector.project(ref, model,
+ m_subDefinitionPath, role, l);
ModelGenerator generator=(ModelGenerator)
RegistryFactory.getRegistry().getExtension(
@@ -312,6 +336,7 @@
}
private String m_name=null;
+ private SubDefinitionPath m_subDefinitionPath=null;
private String m_role=null;
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2009-04-26 21:12:45 UTC (rev 599)
@@ -1,17 +1,9 @@
-<process name="ESBBrokerProcess_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<process name="RequestForQuote_SupplierQuoteEngine" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<partnerLinks>
<partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<sequence>
- <while>
- <sequence>
- <scope>
- <sequence>
- <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
- <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
- </sequence>
- </scope>
- </sequence>
- </while>
+ <receive operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
+ <reply operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/>
</sequence>
</process>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2009-04-26 21:12:45 UTC (rev 599)
@@ -1,23 +1,15 @@
-<process name="ESBBrokerProcess_SupplierTxnProcessor" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+<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>
- <if>
- <sequence>
- <scope>
- <sequence>
- <pick>
- <onMessage operation="confirm" partnerLink="SupplierTxnProcessorToBroker" portType="SupplierTxnProcessorBrokerCallbackPT">
- <sequence>
- <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
- </sequence>
- </onMessage>
- </pick>
- </sequence>
- </scope>
- </sequence>
- </if>
+ <pick>
+ <onMessage operation="confirm" partnerLink="SupplierTxnProcessorToBroker" portType="SupplierTxnProcessorBrokerCallbackPT">
+ <sequence>
+ <reply operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="SupplierTxnProcessorPT"/>
+ </sequence>
+ </onMessage>
+ </pick>
</sequence>
</process>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-26 17:53:56 UTC (rev 598)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-26 21:12:45 UTC (rev 599)
@@ -26,7 +26,6 @@
import javax.xml.transform.stream.StreamResult;
import org.eclipse.core.resources.IFile;
-import org.jboss.tools.overlord.cdl.runtime.jbossesb.generator.BuildSystem;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.conformance.model.transform.StatelessTransformer;
import org.scribble.conversation.model.ConversationModel;
15 years, 2 months
- 1
- 0
Overlord SVN: r598 - in cdl/trunk/tools/plugins: org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator and 2 other directories.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-04-26 13:53:56 -0400 (Sun, 26 Apr 2009)
New Revision: 598
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
Log:
Refactor to use local model references rather than just roles.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-04-26 17:53:56 UTC (rev 598)
@@ -79,7 +79,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
+ m_localModelRefs = m_conversationModel.getLocalModels(ref);
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-26 17:53:56 UTC (rev 598)
@@ -78,7 +78,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_roles = m_conversationModel.getRoles();
+ m_localModelRefs = m_conversationModel.getLocalModels(ref);
}
}
}
@@ -91,12 +91,13 @@
}
/**
- * This method returns the roles that can be generated.
+ * This method returns the local model references that
+ * can be generated.
*
- * @return The roles
+ * @return The local model references
*/
- public java.util.List<Role> getRoles() {
- return(m_roles);
+ public java.util.List<ModelReference> getLocalModels() {
+ return(m_localModelRefs);
}
/**
@@ -208,7 +209,7 @@
private static Logger logger = Logger.getLogger(Generator.class);
private IFile m_file=null;
- private java.util.List<Role> m_roles=null;
+ private java.util.List<ModelReference> m_localModelRefs=null;
private ConversationModel m_conversationModel=null;
private BuildSystem m_buildSystem=null;
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-04-26 17:53:56 UTC (rev 598)
@@ -83,7 +83,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
+ m_localModelRefs = m_conversationModel.getLocalModels(ref);
}
}
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-26 16:27:20 UTC (rev 597)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-26 17:53:56 UTC (rev 598)
@@ -96,7 +96,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_roles = m_conversationModel.getRoles();
+ m_localModelRefs = m_conversationModel.getLocalModels(ref);
}
}
}
@@ -109,12 +109,12 @@
}
/**
- * This method returns the roles that can be generated.
+ * This method returns the local models that can be generated.
*
- * @return The roles
+ * @return The local models
*/
- public java.util.List<Role> getRoles() {
- return(m_roles);
+ public java.util.List<ModelReference> getLocalModels() {
+ return(m_localModelRefs);
}
/**
@@ -510,7 +510,7 @@
private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.runtime.jbossesb.generator");
private IFile m_file=null;
- private java.util.List<Role> m_roles=null;
+ private java.util.List<ModelReference> m_localModelRefs=null;
private ConversationModel m_conversationModel=null;
private GeneratorContext m_context=null;
private java.util.List<ConversationBasedGenerator> m_conversationBasedGen=
15 years, 2 months
- 1
- 0
Overlord SVN: r597 - in cdl/trunk: distribution/src/main/release/samples/jbossesb and 22 other directories.
by overlord-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-04-26 12:27:20 -0400 (Sun, 26 Apr 2009)
New Revision: 597
Added:
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/models/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/models/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/models/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/models/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/models/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/models/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/lib/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/models/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/models/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.classpath
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.project
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/build.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/lib/
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
Removed:
cdl/trunk/distribution/src/main/release/samples/jbossesb/brokerage/
cdl/trunk/distribution/src/main/release/samples/jbossesb/common/
cdl/trunk/distribution/src/main/release/samples/jbossesb/purchasing/
Modified:
cdl/trunk/distribution/src/main/assembly/bin.xml
cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
cdl/trunk/runtime/jbossesb-assembly/pom.xml
cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
Log:
Restructure the sample, as will group samples in stateful and stateless folder.
Modified: cdl/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- cdl/trunk/distribution/src/main/assembly/bin.xml 2009-04-26 15:37:02 UTC (rev 596)
+++ cdl/trunk/distribution/src/main/assembly/bin.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -84,29 +84,88 @@
<directory>../runtime/jbossesb/target/javadoc</directory>
<outputDirectory>docs/jbossesb-javadoc</outputDirectory>
</fileSet>
+
<!-- Copy samples -->
<fileSet>
<directory>src/main/release/samples/jbossesb</directory>
<outputDirectory>samples</outputDirectory>
</fileSet>
+ <!-- Copy stateful examples -->
<fileSet>
- <directory>../samples/jbossesb</directory>
- <outputDirectory>samples</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
+ <directory>../samples/jbossesb/brokerage/broker/stateful/src</directory>
+ <outputDirectory>samples/stateful/brokerage/broker/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/models</directory>
+ <outputDirectory>samples/stateful/brokerage/models</outputDirectory>
<excludes>
- <exclude>**/pom.xml</exclude>
- <exclude>**/.classpath</exclude>
<exclude>**/.project</exclude>
- <exclude>**/.settings</exclude>
- <exclude>**/.settings/**/*</exclude>
- <exclude>**/target</exclude>
- <exclude>**/target/**/*</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/supplier/stateful/src</directory>
+ <outputDirectory>samples/stateful/brokerage/supplier/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/store/stateful/src</directory>
+ <outputDirectory>samples/stateful/purchasing/store/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/models</directory>
+ <outputDirectory>samples/stateful/purchasing/models</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/common/creditAgency/stateful/src</directory>
+ <outputDirectory>samples/stateful/common/creditAgency/src</outputDirectory>
+ </fileSet>
+
+ <!-- Copy stateless examples-->
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/broker/stateless/src</directory>
+ <outputDirectory>samples/stateless/brokerage/broker/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/models</directory>
+ <outputDirectory>samples/stateless/brokerage/models</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/brokerage/supplier/stateless/src</directory>
+ <outputDirectory>samples/stateless/brokerage/supplier/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/store/stateless/src</directory>
+ <outputDirectory>samples/stateless/purchasing/store/src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/purchasing/models</directory>
+ <outputDirectory>samples/stateless/purchasing/models</outputDirectory>
+ <excludes>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/common/creditAgency/stateless/src</directory>
+ <outputDirectory>samples/stateless/common/creditAgency/src</outputDirectory>
+ </fileSet>
+
+ <!-- copy client & trailblazer example-->
+ <fileSet>
+ <directory>../samples/jbossesb/client</directory>
+ <outputDirectory>samples/client</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jbossesb/trailblazer</directory>
+ <outputDirectory>samples/trailblazer</outputDirectory>
+ </fileSet>
+
</fileSets>
<dependencySets>
@@ -118,8 +177,8 @@
to automatically update the .classpath file -->
<dependencySet>
- <outputDirectory>samples/brokerage/broker/lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>samples/stateful/brokerage/broker/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
<include>org.jboss.jbossesb:rosetta</include>
@@ -127,7 +186,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>samples/brokerage/supplier/lib</outputDirectory>
+ <outputDirectory>samples/stateful/brokerage/supplier/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
@@ -136,7 +195,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>samples/purchasing/store/lib</outputDirectory>
+ <outputDirectory>samples/stateful/purchasing/store/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
@@ -145,7 +204,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>samples/common/creditAgency/lib</outputDirectory>
+ <outputDirectory>samples/stateful/common/creditAgency/lib</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
@@ -153,6 +212,42 @@
<include>log4j:log4j</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/stateless/brokerage/broker/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/stateless/brokerage/supplier/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/stateless/purchasing/store/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>samples/stateless/common/creditAgency/lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.soa.overlord.cdl.runtime:cdl-runtime-jbossesb</include>
+ <include>org.jboss.jbossesb:rosetta</include>
+ <include>log4j:log4j</include>
+ </includes>
+ </dependencySet>
</dependencySets>
Modified: cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-04-26 15:37:02 UTC (rev 596)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/common_build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -4,7 +4,7 @@
<property name="build.dir" value="${basedir}/target" />
<property name="classes" value="${build.dir}/classes" />
- <property name="libs" value="../lib" />
+ <property name="libs" value="${basedir}/lib" />
<property name="src" value="src" />
<property name="server.dir" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-broker-stateful</name>
+ <comment></comment>
+ <projects>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/broker/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="broker-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/models/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/models/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/models/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-models</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-supplier-stateful</name>
+ <comment></comment>
+ <projects>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/brokerage/supplier/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="supplier-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>common-creditAgency-stateful</name>
+ <comment></comment>
+ <projects>
+ <project>purchasing-models</project>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/common/creditAgency/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="creditAgency-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/models/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/models/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/models/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>purchasing-models</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>purchasing-store-stateful</name>
+ <comment></comment>
+ <projects>
+ <project>purchasing-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateful/purchasing/store/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="purchasing-store-stateful" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-broker-stateless</name>
+ <comment></comment>
+ <projects>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/broker/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="broker-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/models/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/models/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/models/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-models</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>brokerage-supplier-stateless</name>
+ <comment></comment>
+ <projects>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/brokerage/supplier/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="supplier-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>common-creditAgency-stateless</name>
+ <comment></comment>
+ <projects>
+ <project>purchasing-models</project>
+ <project>brokerage-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/common/creditAgency/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="creditAgency-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/models/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/models/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/models/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>purchasing-models</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.classpath
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.classpath (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.classpath 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/rosetta.jar"/>
+ <classpathentry kind="lib" path="lib/log4j.jar"/>
+ <classpathentry kind="lib" path="lib/cdl-jbossesb.jar"/>
+ <classpathentry kind="output" path="classes"/>
+</classpath>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.project
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.project (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/.project 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>purchasing-store-stateless</name>
+ <comment></comment>
+ <projects>
+ <project>purchasing-models</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/build.xml
===================================================================
--- cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/build.xml (rev 0)
+++ cdl/trunk/distribution/src/main/release/samples/jbossesb/stateless/purchasing/store/build.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="purchasing-store-stateless" default="esbjar" basedir=".">
+
+ <import file="../../../common_build.xml"/>
+
+</project>
Modified: cdl/trunk/runtime/jbossesb-assembly/pom.xml
===================================================================
--- cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-04-26 15:37:02 UTC (rev 596)
+++ cdl/trunk/runtime/jbossesb-assembly/pom.xml 2009-04-26 16:27:20 UTC (rev 597)
@@ -118,7 +118,8 @@
<exclude>org.hibernate:ejb3-persistence</exclude>
<exclude>c3p0:c3p0</exclude>
<exclude>log4j:log4j</exclude>
- <exclude>org.jboss.jbossesb:rosetta</exclude> <exclude>org.mvel:mvel</exclude>
+ <exclude>org.jboss.jbossesb:rosetta</exclude>
+ <exclude>org.mvel:mvel</exclude>
</excludes>
</configuration>
</plugin>
Modified: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2009-04-26 15:37:02 UTC (rev 596)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/BuyerClient.java 2009-04-26 16:27:20 UTC (rev 597)
@@ -41,7 +41,7 @@
System.setProperty("javax.xml.registry.ConnectionFactoryClass", regClass);
try {
- storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_Store");
+ storeInvoker = new ServiceInvoker("PurchaseGoods.Store", "Store.main");
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Failed to create ServiceInvoker", e);
Added: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBrokerClient.java 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package com.acme.services.buyer;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+/**
+ * @author jeffyu
+ *
+ */
+public class StatelessBrokerClient {
+
+ private static Logger logger = Logger.getLogger(BuyerClient.class);
+
+ private ServiceInvoker brokerInvoker;
+
+ public StatelessBrokerClient() {
+
+ String regClass = Configuration.getRegistryFactoryClass();
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass",regClass);
+
+ try {
+ brokerInvoker = new ServiceInvoker("org.pi4soa.esbbroker.esbbroker", "ESBBrokerProcess_Broker");
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to create ServiceInvoker", e);
+ }
+ }
+
+ public void run() {
+
+ String id = "20";
+
+ String quoteReq="<enquiry id=\"" + id +"\" ></enquiry>";
+
+ Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ mesg.getBody().add(quoteReq);
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
+
+ try {
+ System.out.println("=========================================");
+ System.out.println("Request: " + mesg.getBody().get());
+ Message reply=brokerInvoker.deliverSync(mesg, 50000);
+ System.out.println("Reply: "+reply.getBody().get());
+
+ Thread.sleep(5000);//Waiting...
+
+ System.out.println("Sending Buy request to Broker...");
+ String buyReq = "<buy id=\"" + id + "\" supplierDesc=\"{http://www.jboss.org/overlord/loanBroker}Supplier1\" quoteValue=\"10\"></buy>";
+ mesg.getBody().add(buyReq);
+
+ System.out.println("Request: " + mesg.getBody().get());
+ reply = brokerInvoker.deliverSync(mesg, 50000);
+ System.out.println("Reply: " + reply.getBody().get());
+ System.out.println("=========================================");
+ } catch (Exception e) {
+ logger.error(e);
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ StatelessBrokerClient client=new StatelessBrokerClient();
+ client.run();
+ }
+}
Added: cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java
===================================================================
--- cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java (rev 0)
+++ cdl/trunk/samples/jbossesb/client/src/com/acme/services/buyer/StatelessBuyerClient.java 2009-04-26 16:27:20 UTC (rev 597)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package com.acme.services.buyer;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.common.Configuration;
+
+/**
+ * @author gary
+ */
+public class StatelessBuyerClient {
+
+ private static Logger logger = Logger.getLogger(StatelessBuyerClient.class);
+
+ private ServiceInvoker storeInvoker;
+
+ public StatelessBuyerClient() {
+
+ String regClass = Configuration.getRegistryFactoryClass();
+ System.setProperty("javax.xml.registry.ConnectionFactoryClass", regClass);
+
+ try {
+ storeInvoker = new ServiceInvoker("org.pi4soa.purchase.purchasegoods", "PurchaseGoodsProcess_Store");
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("Failed to create ServiceInvoker", e);
+ }
+ }
+
+ public void run() {
+
+ String buyReq="<BuyRequest id=\"5\" ></BuyRequest>";
+
+ Message mesg = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ mesg.getBody().add(buyReq);
+ mesg.getProperties().setProperty("org.jboss.soa.esb.exceptionOnDeliverFailure", "true");
+
+ try {
+ System.out.println("=========================================");
+ System.out.println("Request: "+mesg.getBody().get());
+ Message reply=storeInvoker.deliverSync(mesg, 20000);
+
+ if (reply != null) {
+ System.out.println("Reply: "+reply.getBody().get());
+ } else {
+ System.err.println("NO REPLY");
+ }
+ System.out.println("=========================================");
+ } catch (Exception e) {
+ logger.error(e);
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ StatelessBuyerClient client=new StatelessBuyerClient();
+
+ client.run();
+ }
+
+}
15 years, 2 months
- 1
- 0
Overlord SVN: r596 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb: generator and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-04-26 11:37:02 -0400 (Sun, 26 Apr 2009)
New Revision: 596
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
Log:
Switch over to use local model references from global model, which also includes the sub-definition path.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-04-25 22:59:25 UTC (rev 595)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2009-04-26 15:37:02 UTC (rev 596)
@@ -83,7 +83,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_roles = m_conversationModel.getRoles();
+ m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
}
}
}
@@ -151,10 +151,10 @@
if (m_conversationModel != null) {
- for (int i=0; i < m_roles.size(); i++) {
+ for (int i=0; i < m_localModelRefs.size(); i++) {
Button button=new Button(group, SWT.CHECK);
- button.setText(m_roles.get(i).getName());
+ button.setText(m_localModelRefs.get(i).getLocatedRole());
button.setSelection(true);
gd = new GridData();
@@ -196,7 +196,7 @@
Text projectName=new Text(group, SWT.NONE);
- String prjName=m_roles.get(i).getName();
+ String prjName=m_localModelRefs.get(i).getLocatedRole();
if (m_conversationModel.getModelName() != null) {
prjName = m_conversationModel.getModelName().getName()+"-"+prjName;
@@ -380,10 +380,10 @@
Generator generator=new Generator(m_file,
context);
- for (int i=0; i < m_roles.size(); i++) {
+ for (int i=0; i < m_localModelRefs.size(); i++) {
if (m_roleButtons.get(i).getSelection()) {
- generator.generateRole(m_roles.get(i),
+ generator.generateRole(m_localModelRefs.get(i),
m_statelessButtons.get(i).getSelection(),
m_projectNames.get(i).getText());
}
@@ -425,7 +425,7 @@
private IFile m_file=null;
private ConversationModel m_conversationModel=null;
- private java.util.List<Role> m_roles=null;
+ private java.util.List<ModelReference> m_localModelRefs=null;
private java.util.List<Button> m_roleButtons=new java.util.Vector<Button>();
private java.util.List<Button> m_statelessButtons=new java.util.Vector<Button>();
private java.util.List<Text> m_projectNames=new java.util.Vector<Text>();
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-25 22:59:25 UTC (rev 595)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2009-04-26 15:37:02 UTC (rev 596)
@@ -121,16 +121,17 @@
* This method generates the project associated with the
* supplied role.
*
- * @param role The role
+ * @param localModelRef The local model reference
* @param stateless Whether the generated role should be stateless
* @param projectName The project name
* @throws Exception Failed to generate role
*/
- public void generateRole(Role role, boolean stateless, String projectName)
+ public void generateRole(ModelReference localModelRef,
+ boolean stateless, String projectName)
throws Exception {
if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Generate role '"+role+"' for: "+
+ logger.finest("Generate local model '"+localModelRef+"' for: "+
m_conversationModel);
}
@@ -141,10 +142,12 @@
org.scribble.projector.Projector.class, null);
if (projector != null) {
+ Role role=new Role(localModelRef.getLocatedRole());
+
ModelReference ref=new ModelReference(ConversationNotation.NOTATION_CODE);
Model localModel=projector.project(ref,
- m_conversationModel,
+ m_conversationModel, localModelRef.getSubDefinitionPath(),
role, new DefaultModelListener());
if (localModel instanceof ConversationModel &&
15 years, 2 months
- 1
- 0
Overlord SVN: r595 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel: generator and 1 other directory.
by overlord-commits＠lists.jboss.org
Author: objectiser
Date: 2009-04-25 18:59:25 -0400 (Sat, 25 Apr 2009)
New Revision: 595
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
Log:
Updated to use model references, rather than just roles, to enable roles associated with sub-definitions within a global model to be projected to local models specific to that scope.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-04-23 19:37:51 UTC (rev 594)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/dialogs/GenerateDialog.java 2009-04-25 22:59:25 UTC (rev 595)
@@ -79,7 +79,7 @@
m_conversationModel = (ConversationModel)
models.get(i).getModel();
- m_roles = m_conversationModel.getRoles();
+ m_localModelRefs = m_conversationModel.getLocalModelReferences(ref);
}
}
}
@@ -139,10 +139,10 @@
if (m_conversationModel != null) {
- for (int i=0; i < m_roles.size(); i++) {
+ for (int i=0; i < m_localModelRefs.size(); i++) {
Button button=new Button(group, SWT.CHECK);
- button.setText(m_roles.get(i).getName());
+ button.setText(m_localModelRefs.get(i).getLocatedRole());
button.setSelection(true);
gd = new GridData();
@@ -164,7 +164,7 @@
Text projectName=new Text(group, SWT.NONE);
- String prjName=m_roles.get(i).getName();
+ String prjName=m_localModelRefs.get(i).getLocatedRole();
if (m_conversationModel.getModelName() != null) {
prjName = m_conversationModel.getModelName().getName()+"-"+prjName;
@@ -332,10 +332,10 @@
Generator generator=new Generator(m_file,
getSelectedBuildSystem());
- for (int i=0; i < m_roles.size(); i++) {
+ for (int i=0; i < m_localModelRefs.size(); i++) {
if (m_roleButtons.get(i).getSelection()) {
- generator.generateRole(m_roles.get(i),
+ generator.generateRole(m_localModelRefs.get(i),
m_projectNames.get(i).getText());
}
}
@@ -372,7 +372,7 @@
private IFile m_file=null;
private ConversationModel m_conversationModel=null;
- private java.util.List<Role> m_roles=null;
+ private java.util.List<ModelReference> m_localModelRefs=null;
private java.util.List<Button> m_roleButtons=new java.util.Vector<Button>();
private java.util.List<Text> m_projectNames=new java.util.Vector<Text>();
private Combo m_build=null;
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-23 19:37:51 UTC (rev 594)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-25 22:59:25 UTC (rev 595)
@@ -101,17 +101,18 @@
/**
* This method generates the project associated with the
- * supplied role.
+ * supplied role (and optional sub-definition path) contained
+ * in the local model reference.
*
- * @param role The role
+ * @param localModelRef The local model reference
* @param projectName The project name
* @throws Exception Failed to generate role
*/
- public void generateRole(Role role, String projectName)
+ public void generateRole(ModelReference localModelRef, String projectName)
throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug("Generate role '"+role+"' for: "+
+ logger.debug("Generate local model '"+localModelRef+"' for: "+
m_conversationModel);
}
@@ -122,11 +123,14 @@
org.scribble.projector.Projector.class, null);
if (projector != null) {
+ Role role=new Role(localModelRef.getLocatedRole());
+
ModelReference srcRef=
new ModelReference(ConversationNotation.NOTATION_CODE);
Model localModel=projector.project(srcRef, m_conversationModel,
- role, new DefaultModelListener());
+ localModelRef.getSubDefinitionPath(), role,
+ new DefaultModelListener());
if (localModel instanceof ConversationModel &&
((ConversationModel)localModel).getConversation() != null) {
15 years, 2 months
- 1
- 0