[savara-commits] savara SVN: r77 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: java/org/jboss/savara/tools/bpel/model/util and 5 other directories.

Author: objectiser Date: 2009-11-08 18:21:33 -0500 (Sun, 08 Nov 2009) New Revision: 77 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java Log: Update to use scribble mechanism for determining initial interactions for 'createInstance' attribute. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -95,22 +95,19 @@ Sequence seq=new Sequence(bpelModel); + ModelChangeUtils.addContracts(context, conv); + // Check if root conversation if (conv.getParent() instanceof Model) { - ModelChangeUtils.initializeContracts(context, conv); - // Set the name of the process bpelModel.getBPELProcess().setName(conv.getLocatedName().getName()+"_"+ conv.getLocatedName().getRole().getName()); // Get contract - //Contract contract=ModelChangeUtils.getContract(context, conv.getLocatedName().getRole().getName()); + Contract contract=ModelChangeUtils.getContract(context, conv.getLocatedName().getRole().getName()); - if (conv.getLocatedName().getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)conv.getLocatedName(). - getRole().getAnnotations().get(Contract.class.getName()); - + if (contract != null) { roleNamespace = contract.getNamespace(); // Set namespace @@ -201,6 +198,8 @@ // Reset old parent context.setParent(parent); + ModelChangeUtils.removeContracts(context, conv); + return(true); } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -108,9 +108,8 @@ String mainPrefix=null; - if (context.getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)context.getRole().getAnnotations().get(Contract.class.getName()); - + Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + if (contract != null) { mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace()); } @@ -128,12 +127,11 @@ } } - if (roleType != null && - roleType.getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)roleType.getAnnotations().get(Contract.class.getName()); + if (roleType != null) { + contract = ModelChangeUtils.getContract(context, roleType.getName()); // Assume that contract only has one interface for now - if (contract.getInterfaces().size() > 0) { + if (contract != null && contract.getInterfaces().size() > 0) { intf = contract.getInterfaces().get(0); } } @@ -286,7 +284,7 @@ } // Check if create instance - if (InteractionUtil.isFirstInteraction(interaction)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(interaction)) { ((Receive)act).setCreateInstance(true); } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2009-11-08 23:21:33 UTC (rev 77) @@ -224,9 +224,8 @@ String mainPrefix=null; - if (context.getRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)context.getRole().getAnnotations().get(Contract.class.getName()); - + Contract contract=ModelChangeUtils.getContract(context, context.getRole().getName()); + if (contract != null) { mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace()); } @@ -249,19 +248,17 @@ pl.setPartnerLinkType(plt); - if (role.getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)role.getAnnotations().get(Contract.class.getName()); + contract = ModelChangeUtils.getContract(context, role.getName()); + + if (contract != null && contract.getInterfaces().size() > 0) { + Interface intf = contract.getInterfaces().get(0); - if (contract.getInterfaces().size() > 0) { - Interface intf = contract.getInterfaces().get(0); - - portType = intf.getName(); - - String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); - - if (prefix != null) { - portType = prefix+":"+portType; - } + portType = intf.getName(); + + String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); + + if (prefix != null) { + portType = prefix+":"+portType; } } } else { @@ -280,22 +277,18 @@ //portType = role.getName()+ // recv.getFromRole().getName()+"CallbackPT"; - if (recv.getFromRole().getAnnotations().containsKey(Contract.class.getName())) { - Contract contract=(Contract)recv.getFromRole().getAnnotations().get(Contract.class.getName()); + contract = ModelChangeUtils.getContract(context, recv.getFromRole().getName()); + if (contract != null && contract.getInterfaces().size() > 0) { + Interface intf = contract.getInterfaces().get(0); - if (contract.getInterfaces().size() > 0) { - Interface intf = contract.getInterfaces().get(0); - - portType = intf.getName(); - - String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); - - if (prefix != null) { - portType = prefix+":"+portType; - } + portType = intf.getName(); + + String prefix = bpelModel.getBPELProcess().addNamespace(intf.getNamespace()); + + if (prefix != null) { + portType = prefix+":"+portType; } } - } // Create partner link @@ -321,7 +314,7 @@ } // Check if create instance - if (InteractionUtil.isFirstInteraction(recv)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(recv)) { act.setCreateInstance(true); } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ModelChangeUtils.java 2009-11-08 23:21:33 UTC (rev 77) @@ -28,26 +28,30 @@ public class ModelChangeUtils { /** - * This method checks whether the contracts need to be initialized. + * This method adds any contracts associated with roles defined in the + * supplied conversation. * * @param context The context * @param conv The conversation */ - public static void initializeContracts(ModelChangeContext context, Conversation conv) { + public static void addContracts(ModelChangeContext context, Conversation conv) { - if (context.getProperties().containsKey(Contract.class.getName()) == false) { - java.util.Map<String,Contract> contracts=new java.util.HashMap<String, Contract>(); + java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) + context.getProperties().get(Contract.class.getName()); + + if (contracts == null) { + contracts = new java.util.HashMap<String, Contract>(); - if (conv.getLocatedName().getRole() != null) { - initializeRoleContract(conv.getLocatedName().getRole(), contracts); - } - - for (Role r : conv.getRoles()) { - initializeRoleContract(r, contracts); - } - context.getProperties().put(Contract.class.getName(), contracts); } + + if (conv.getLocatedName().getRole() != null) { + addRoleContract(conv.getLocatedName().getRole(), contracts); + } + + for (Role r : conv.getRoles()) { + addRoleContract(r, contracts); + } } /** @@ -56,7 +60,7 @@ * @param role The role * @param contracts The map of roles to contracts */ - protected static void initializeRoleContract(Role role, java.util.Map<String,Contract> contracts) { + protected static void addRoleContract(Role role, java.util.Map<String,Contract> contracts) { if (role != null && role.getAnnotations().containsKey(Contract.class.getName())) { contracts.put(role.getName(), (Contract)role.getAnnotations().get(Contract.class.getName())); @@ -64,6 +68,42 @@ } /** + * This method removes the contract associated with the supplied role. + * + * @param role The role + * @param contracts The map of roles to contracts + */ + protected static void removeRoleContract(Role role, java.util.Map<String,Contract> contracts) { + if (role != null && role.getAnnotations().containsKey(Contract.class.getName())) { + contracts.remove(role.getName()); + } + } + + /** + * This method removes any contracts associated with roles defined in the + * supplied conversation. + * + * @param context The context + * @param conv The conversation + */ + public static void removeContracts(ModelChangeContext context, Conversation conv) { + + java.util.Map<String,Contract> contracts=(java.util.Map<String,Contract>) + context.getProperties().get(Contract.class.getName()); + + if (contracts != null) { + + if (conv.getLocatedName().getRole() != null) { + removeRoleContract(conv.getLocatedName().getRole(), contracts); + } + + for (Role r : conv.getRoles()) { + removeRoleContract(r, contracts); + } + } + } + + /** * This method returns the contract associated with the supplied role. * * @param contezt The context Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/util/InteractionUtil.java 2009-11-08 23:21:33 UTC (rev 77) @@ -98,53 +98,6 @@ * @param interaction The interaction * @return Whether the interaction is the first in the conversation */ - public static boolean isFirstInteraction(Interaction interaction) { - boolean ret=false; - - if (interaction.getParent() instanceof Block && - interaction.getParent().getParent() != null) { - ModelObject parent=(ModelObject)interaction.getParent().getParent(); - - // Check that first interaction in block - Block block=(Block)interaction.getParent(); - ret = true; - - for (int i=0; ret && i < block.getContents().size(); i++) { - if (block.getContents().get(i) == interaction) { - break; - } else if (block.getContents().get(i) instanceof Interaction) { - ret = false; - } - } - - // Check if definition - if (ret) { - - if (parent instanceof If) { - if (parent.getParent() instanceof Block) { - parent = parent.getParent().getParent(); - } - } - - if (parent instanceof Definition) { - - // Check if it is the top level definition - ret = (parent.getParent() instanceof Model); - - // TODO: How do we know if this conversation is the - // top level, or has it been 'run' by the top level - // conversation? While the conversation used to - // generate the BPEL is produced as one definition, - // this should not be a problem. - } else { - ret = false; - } - } - } - - return(ret); - } - /** * This method determines whether the supplied activity * is either an invoke, or a sequence that has an Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/GeneratorTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -34,9 +34,11 @@ public class GeneratorTest extends TestCase { public static TestSuite suite() { - TestSuite suite = new TestSuite("Conversation->BPEL Generator Tests"); + TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Broker")); + + /* suite.addTest(new ChoreographyToBPELTest("ESBBroker", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", "CreditAgency")); suite.addTest(new ChoreographyToBPELTest("ESBBroker", @@ -50,7 +52,8 @@ suite.addTest(new ChoreographyToBPELTest("PurchaseGoods", "Store")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTest("ReqRespFault", "Seller")); - + */ + return suite; } @@ -119,17 +122,9 @@ org.scribble.projector.Projector projector= new org.scribble.projector.DefaultProjector(); - org.scribble.model.Role role= - new org.scribble.model.Role(m_role); + org.scribble.model.Role role=null; - org.scribble.model.Model projected= - projector.project(ref, model, - m_subDefinitionPath, role, l); - - ModelGenerator generator=(ModelGenerator) - RegistryFactory.getRegistry().getExtension( - ModelGenerator.class, null); - + // Obtain role from definition java.util.List<Definition> defns=model.getDefinitions(); Definition defn=null; @@ -137,34 +132,63 @@ defn = defns.get(0); } - if (generator != null && defn != null) { - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - targetRef.setAlias(m_name); - targetRef.setLocatedRole(m_role); + java.util.List<org.scribble.model.Role> roles=defn.getRoles(); + //new org.scribble.model.Role(m_role); + + for (int i=0; role == null && i < roles.size(); i++) { + if (roles.get(i).getName().equals(m_role)) { + role = roles.get(i); + } + } + + if (role == null) { + result.addError(this, + new Throwable("Role '"+m_role+"' not found")); + } else { + + org.scribble.model.Model projected= + projector.project(ref, model, + m_subDefinitionPath, role, l); - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - generator.generate(targetRef, - defn.getLocatedName().getRole(), - target, projected); + ModelGenerator generator=(ModelGenerator) + RegistryFactory.getRegistry().getExtension( + ModelGenerator.class, null); + + defns = projected.getDefinitions(); + defn = null; - if (target.getBPELProcess().getDOMElement() != null) { - try { - String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); - checkResults(result, text); - } catch(Exception e) { - result.addError(this, e); + if (defns.size() == 1) { + defn = defns.get(0); + } + + if (generator != null && defn != null) { + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + targetRef.setAlias(m_name); + targetRef.setLocatedRole(m_role); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + generator.generate(targetRef, role, + target, projected); + + if (target.getBPELProcess().getDOMElement() != null) { + try { + String text=XMLUtils.toText(target.getBPELProcess().getDOMElement()); + checkResults(result, text); + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("No BPEL generated")); } + } else { result.addError(this, - new Throwable("No BPEL generated")); + new Throwable("Unable to find Model Generator")); } - - } else { - result.addError(this, - new Throwable("Unable to find Model Generator")); } } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2009-11-08 23:21:33 UTC (rev 77) @@ -1,9 +1,13 @@ -<process xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="ESBBroker@Broker" name="ESBBrokerProcess_Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... +<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> + <import importType="http://schemas.xmlsoap.org/wsdl/" location="BrokerPartnerLinkTypes.wsdl" namespace="http://www.pi4soa.org/ESBBroker"/> <partnerLinks> - <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="BuyerToBrokerServiceLT"/> - <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> - <partnerLink name="BrokerToCreditAgency" partnerLinkType="BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> - <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> + <partnerLink myRole="BrokerService" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerServiceLT"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="tns:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> </partnerLinks> <variables> <variable messageType="enquiry" name="enquiryVar"/> @@ -15,46 +19,45 @@ <variable messageType="CreditCheckOk" name="creditCheckOkVar"/> <variable messageType="orderConfirmed" name="orderConfirmedVar"/> <variable messageType="bookingReference" name="bookingReferenceVar"/> - <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/> <variable messageType="orderRejected" name="orderRejectedVar"/> <variable messageType="cancel" name="cancelVar"/> </variables> <sequence> - <receive operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="enquiryVar"/> + <receive createInstance="yes" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/> <while> <sequence> <scope> <sequence> - <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="SupplierQuoteEnginePT"/> + <invoke inputVariable="requestForQuoteVar" operation="getQuote" outputVariable="quoteVar" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior"/> </sequence> </scope> </sequence> </while> - <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="BrokerPT" variable="quoteListVar"/> + <reply operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="quoteListVar"/> <pick> - <onMessage operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="buyVar"> + <onMessage operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="buyVar"> <sequence> <scope> <sequence> <scope> <faultHandlers> - <catch faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> + <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar"> <sequence> - <reply faultName="rejected" operation="buy" partnerLink="BuyerToBroker" portType="BrokerPT" variable="orderRejectedVar"/> + <reply faultName="tns:rejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/> </sequence> </catch> </faultHandlers> <sequence> - <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"/> + <invoke inputVariable="creditCheckRequestVar" operation="checkCredit" outputVariable="creditCheckOkVar" partnerLink="BrokerToCreditAgency" portType="tns:CreditAgencyBehavior"/> + <invoke inputVariable="orderConfirmedVar" operation="confirm" outputVariable="bookingReferenceVar" partnerLink="BrokerToSupplierTxnProcessor" portType="tns:SupplierBehavior"/> + <reply operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="bookingReferenceVar"/> </sequence> </scope> </sequence> </scope> </sequence> </onMessage> - <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="BrokerPT" variable="cancelVar"> + <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="cancelVar"> <sequence/> </onMessage> </pick> Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/ParserTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -33,6 +33,7 @@ public static TestSuite suite() { TestSuite suite = new TestSuite("BPEL->Conversation Parser Tests"); + /* suite.addTest(new BPELToConversationTest("ESBBroker@Broker")); suite.addTest(new BPELToConversationTest("ESBBroker@Buyer")); suite.addTest(new BPELToConversationTest("ESBBroker@CreditAgency")); @@ -45,6 +46,7 @@ suite.addTest(new BPELToConversationTest("ReqRespFault@Seller")); suite.addTest(new BPELToConversationTest("LoanApprovalService@Service")); + */ return suite; } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/change/ModelChangeUtilsTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -44,7 +44,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); Contract c2=ModelChangeUtils.getContract(context, MY_ROLE); @@ -71,11 +71,21 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); + Conversation conv2=new Conversation(); + LocatedName ln2=new LocatedName(); + Role r2=new Role(); + r2.setName(MY_OTHER_ROLE); + Contract c2=new Contract(); - r.getAnnotations().put(Contract.class.getName(), c2); + r2.getAnnotations().put(Contract.class.getName(), c2); + ln2.setRole(r2); + conv2.setLocatedName(ln2); + + ModelChangeUtils.addContracts(context, conv2); + Contract c3=ModelChangeUtils.getContract(context, MY_ROLE); if (c3 == null) { @@ -85,6 +95,16 @@ if (c3 != c) { fail("Contract not the same as the one stored"); } + + Contract c4=ModelChangeUtils.getContract(context, MY_OTHER_ROLE); + + if (c4 == null) { + fail("Contract not found"); + } + + if (c4 != c2) { + fail("Contract2 not the same as the one stored"); + } } public void testPushRoleContractMapping() { @@ -101,7 +121,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); java.util.List<DeclarationBinding> bindings=new java.util.Vector<DeclarationBinding>(); @@ -142,7 +162,7 @@ ln.setRole(r); conv.setLocatedName(ln); - ModelChangeUtils.initializeContracts(context, conv); + ModelChangeUtils.addContracts(context, conv); java.util.List<DeclarationBinding> bindings=new java.util.Vector<DeclarationBinding>(); Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 15:03:11 UTC (rev 76) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/util/InteractionUtilTest.java 2009-11-08 23:21:33 UTC (rev 77) @@ -34,7 +34,7 @@ c.getBlock().getContents().add(i1); - if (InteractionUtil.isFirstInteraction(i1) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i1) == false) { fail("Interaction should be first in conversation"); } } @@ -50,7 +50,7 @@ c.getBlock().getContents().add(i1); c.getBlock().getContents().add(i2); - if (InteractionUtil.isFirstInteraction(i2)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i2)) { fail("Interaction should NOT be first in conversation"); } } @@ -77,15 +77,15 @@ b2.getContents().add(i2); b2.getContents().add(i3); - if (InteractionUtil.isFirstInteraction(i1) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i1) == false) { fail("Interaction should be first in conversation"); } - if (InteractionUtil.isFirstInteraction(i2) == false) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i2) == false) { fail("Interaction should be first in conversation"); } - if (InteractionUtil.isFirstInteraction(i3)) { + if (org.scribble.model.util.InteractionUtil.isInitialInteraction(i3)) { fail("Interaction should NOT be first in conversation"); } }