Author: objectiser Date: 2011-02-10 13:11:03 -0500 (Thu, 10 Feb 2011) New Revision: 647 Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/util/BPELModelUtilTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Broker.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierQuoteEngine.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierTxnProcessor.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote(a)PolicyQuoteProcessService.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Store.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Seller.bpel branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolUtils.java branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/util/WSDLGeneratorUtil.java Log: SAVARA-175 - further work required, as initial fix did not work where the original BPEL process did not carry the namespace prefix information somewhere internally. So the original BPEL TProcess object needs to be constructed with the namespace/prefix info, and then additional the generated XML needs to be reparsed/transformed to remove the namespaces from lower level elements and use the top level info. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-02-10 18:11:03 UTC (rev 647) @@ -22,6 +22,9 @@ import org.savara.bpel.BPELDefinitions; import org.savara.bpel.model.TProcess; import org.savara.bpel.model.change.BPELModelChangeContext; +import org.savara.bpel.util.BPELModelUtil; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.common.model.generator.ModelGenerator; import org.savara.contract.model.Contract; import org.savara.protocol.contract.generator.ContractGenerator; @@ -49,9 +52,48 @@ new BPELModelChangeContext(null, new CachedJournal()); ProtocolModel pm=(ProtocolModel)source; + // SAVARA-175: + // Add namespace prefix mapping to a BPEL process defined in text and + // deserialize the process to create the initial model. This is the only + // way to enable the namespace prefix mapping info to be associated with + // the top level element in the exported text representation, without + // having to resort to using internal Sun classes that change between + // JDK versions. + String process="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\" "; + + java.util.Map<String, String> prefixes= + new java.util.HashMap<String, String>(); + + java.util.List<Annotation> list= + AnnotationDefinitions.getAnnotations(pm.getProtocol().getAnnotations(), + AnnotationDefinitions.TYPE); + + for (Annotation annotation : list) { + if (annotation.getProperties().containsKey(AnnotationDefinitions.NAMESPACE_PROPERTY) && + annotation.getProperties().containsKey(AnnotationDefinitions.PREFIX_PROPERTY)) { + prefixes.put((String)annotation.getProperties().get(AnnotationDefinitions.NAMESPACE_PROPERTY), + (String)annotation.getProperties().get(AnnotationDefinitions.PREFIX_PROPERTY)); + + process += "xmlns:"+(String)annotation.getProperties().get(AnnotationDefinitions.PREFIX_PROPERTY)+ + "=\""+(String)annotation.getProperties().get(AnnotationDefinitions.NAMESPACE_PROPERTY)+"\" "; + } + } + + process += "/>"; + // Create BPEL model - TProcess bpel=new TProcess(); + TProcess bpel=null; + try { + java.io.ByteArrayInputStream io=new java.io.ByteArrayInputStream(process.getBytes()); + + bpel = BPELModelUtil.deserialize(io); + + io.close(); + } catch(Exception e) { + journal.error("Failed to create initial BPEL process", null); + } + context.setParent(bpel); ProtocolModel bpelModel=new ProtocolModel(); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-02-10 18:11:03 UTC (rev 647) @@ -40,6 +40,9 @@ import org.savara.protocol.model.change.ModelChangeContext; import org.savara.protocol.model.change.ModelChangeUtils; import org.savara.protocol.model.util.InteractionUtil; +import org.savara.protocol.util.ProtocolUtils; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.contract.model.Contract; import org.savara.contract.model.Interface; import org.savara.wsdl.util.WSDLGeneratorUtil; @@ -178,7 +181,8 @@ // Define fault message type QName qname= WSDLGeneratorUtil.getFaultMessageType(fromContract.getNamespace(), - faultName); + faultName, + ProtocolUtils.getNamespacePrefix(elem.getModel(), fromContract.getNamespace())); String faultVarName=qname.getLocalPart()+"Var"; //String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act); @@ -199,7 +203,8 @@ } */ - c.setFaultName(new QName(qname.getNamespaceURI(), faultName)); + c.setFaultName(new QName(qname.getNamespaceURI(), faultName, + ProtocolUtils.getNamespacePrefix(elem.getModel(), qname.getNamespaceURI()))); c.setFaultMessageType(qname); // Add catch to fault handler @@ -221,13 +226,16 @@ QName qname=null; if (InteractionUtil.isRequest(path)) { qname = WSDLGeneratorUtil.getRequestMessageType(fromContract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), fromContract.getNamespace())); } else if (InteractionUtil.isFaultResponse(path)) { qname = WSDLGeneratorUtil.getFaultMessageType(fromContract.getNamespace(), - InteractionUtil.getFaultName(path)); + InteractionUtil.getFaultName(path), + ProtocolUtils.getNamespacePrefix(elem.getModel(), fromContract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(fromContract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), fromContract.getNamespace())); } String varName=qname.getLocalPart()+"Var"; //InteractionPatterns.getVariableName((Interaction)act); @@ -318,7 +326,8 @@ contract = ModelChangeUtils.getContract(context, role); if (contract != null) { - pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt)); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); if (contract.getInterfaces().size() > 0) { Interface intf = contract.getInterfaces().iterator().next(); @@ -349,7 +358,8 @@ contract = ModelChangeUtils.getContract(context, elem.getFromRole()); if (contract != null) { - pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt)); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); if (contract.getInterfaces().size() > 0) { Interface intf = contract.getInterfaces().iterator().next(); @@ -371,13 +381,16 @@ QName qname=null; if (InteractionUtil.isRequest(path)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else if (InteractionUtil.isFaultResponse(path)) { qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(), - InteractionUtil.getFaultName(path)); + InteractionUtil.getFaultName(path), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } String varName=qname.getLocalPart()+"Var"; //InteractionPatterns.getVariableName(recv); @@ -415,7 +428,8 @@ // Set details on interaction onm.setPartnerLink(pl.getName()); - onm.setPortType(new QName(namespace, portType)); + onm.setPortType(new QName(namespace, portType, + ProtocolUtils.getNamespacePrefix(elem.getModel(), namespace))); MessageSignature ms=path.getMessageSignature(); if (ms.getOperation() != null) { @@ -454,13 +468,16 @@ QName qname=null; if (InteractionUtil.isRequest(path)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else if (InteractionUtil.isFaultResponse(path)) { qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(), - InteractionUtil.getFaultName(path)); + InteractionUtil.getFaultName(path), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } String varName = qname.getLocalPart()+"Var"; @@ -487,7 +504,8 @@ String plt=elem.getToRole().getName()+"To"+role.getName()+"Service"+"LT"; - pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt)); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); //portType = role.getName()+"PT"; @@ -495,7 +513,8 @@ String faultName=InteractionUtil.getFaultName(path); // TODO: Not sure what to do about namespace here? - reply.setFaultName(new QName(contract.getNamespace(), faultName)); + reply.setFaultName(new QName(contract.getNamespace(), faultName, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); } if (varName != null) { @@ -525,7 +544,8 @@ } reply.setPartnerLink(pl.getName()); - reply.setPortType(new QName(contract.getNamespace(),portType)); + reply.setPortType(new QName(contract.getNamespace(),portType, + ProtocolUtils.getNamespacePrefix(elem.getModel(),contract.getNamespace()))); if (path.getMessageSignature() != null) { reply.setOperation(path.getMessageSignature().getOperation()); } @@ -535,13 +555,16 @@ QName qname=null; if (InteractionUtil.isRequest(path)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else if (InteractionUtil.isFaultResponse(path)) { qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(), - InteractionUtil.getFaultName(path)); + InteractionUtil.getFaultName(path), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - path.getMessageSignature().getOperation()); + path.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace())); } String varName = qname.getLocalPart()+"Var"; @@ -573,7 +596,8 @@ String plt=role.getName()+"To"+elem.getToRole().getName()+"LT"; - pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt)); + pl.setPartnerLinkType(new QName(contract.getNamespace(), plt, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); // Create partner link TPartnerLink other= @@ -599,7 +623,8 @@ } invoke.setPartnerLink(pl.getName()); - invoke.setPortType(new QName(contract.getNamespace(),portType)); + invoke.setPortType(new QName(contract.getNamespace(),portType, + ProtocolUtils.getNamespacePrefix(elem.getModel(), contract.getNamespace()))); if (path.getMessageSignature() != null) { invoke.setOperation(path.getMessageSignature().getOperation()); } @@ -689,10 +714,12 @@ QName qname=null; if (InteractionUtil.isRequest(interaction)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } /* @@ -760,10 +787,12 @@ QName qname=null; if (InteractionUtil.isRequest(interaction)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } /* Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-02-10 18:11:03 UTC (rev 647) @@ -36,6 +36,7 @@ import org.savara.protocol.model.change.ModelChangeContext; import org.savara.protocol.model.change.ModelChangeUtils; import org.savara.protocol.model.util.InteractionUtil; +import org.savara.protocol.util.ProtocolUtils; import org.savara.common.model.annotation.Annotation; import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.contract.model.Contract; @@ -204,13 +205,16 @@ QName qname=null; if (InteractionUtil.isRequest(interaction)) { qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } else if (InteractionUtil.isFaultResponse(interaction)) { qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(), - InteractionUtil.getFaultName(interaction)); + InteractionUtil.getFaultName(interaction), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } else { qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(), - interaction.getMessageSignature().getOperation()); + interaction.getMessageSignature().getOperation(), + ProtocolUtils.getNamespacePrefix(interaction.getModel(), contract.getNamespace())); } varName = qname.getLocalPart()+"Var"; @@ -277,7 +281,8 @@ String plt=role.getName()+"To"+interaction.getToRoles().get(0).getName()+"LT"; - pl.setPartnerLinkType(new QName(roleNamespace, plt)); + pl.setPartnerLinkType(new QName(roleNamespace, plt, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), roleNamespace))); //portType = interaction.getToRole().getName()+"PT"; @@ -294,7 +299,8 @@ String plt=interaction.getToRoles().get(0)+"To"+role.getName()+"Service"+"LT"; - pl.setPartnerLinkType(new QName(roleNamespace, plt)); + pl.setPartnerLinkType(new QName(roleNamespace, plt, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), roleNamespace))); //portType = role.getName()+"PT"; @@ -313,7 +319,8 @@ //} // TODO: Not sure what to do about namespace here? - ((TReply)act).setFaultName(new QName(intf.getNamespace(), faultName)); + ((TReply)act).setFaultName(new QName(intf.getNamespace(), faultName, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), intf.getNamespace()))); } if (varName != null) { @@ -356,7 +363,8 @@ String plt=interaction.getFromRole().getName()+"To"+role.getName()+"Service"+"LT"; - pl.setPartnerLinkType(new QName(roleNamespace, plt)); + pl.setPartnerLinkType(new QName(roleNamespace, plt, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), roleNamespace))); //portType = role.getName()+"PT"; } else { @@ -366,7 +374,8 @@ String plt=role.getName()+"To"+interaction.getFromRole().getName()+"Requester"+"LT"; - pl.setPartnerLinkType(new QName(roleNamespace, plt)); + pl.setPartnerLinkType(new QName(roleNamespace, plt, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), roleNamespace))); //portType = role.getName()+ // interaction.getFromRole().getName()+"CallbackPT"; @@ -420,19 +429,22 @@ // Set details on interaction if (act instanceof TInvoke) { ((TInvoke)act).setPartnerLink(pl.getName()); - ((TInvoke)act).setPortType(new QName(intf.getNamespace(),portType)); + ((TInvoke)act).setPortType(new QName(intf.getNamespace(),portType, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), intf.getNamespace()))); if (interaction.getMessageSignature() != null) { ((TInvoke)act).setOperation(interaction.getMessageSignature().getOperation()); } } else if (act instanceof TReceive) { ((TReceive)act).setPartnerLink(pl.getName()); - ((TReceive)act).setPortType(new QName(intf.getNamespace(),portType)); + ((TReceive)act).setPortType(new QName(intf.getNamespace(),portType, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), intf.getNamespace()))); if (interaction.getMessageSignature() != null) { ((TReceive)act).setOperation(interaction.getMessageSignature().getOperation()); } } else if (act instanceof TReply) { ((TReply)act).setPartnerLink(pl.getName()); - ((TReply)act).setPortType(new QName(intf.getNamespace(),portType)); + ((TReply)act).setPortType(new QName(intf.getNamespace(),portType, + ProtocolUtils.getNamespacePrefix(interaction.getModel(), intf.getNamespace()))); if (interaction.getMessageSignature() != null) { ((TReply)act).setOperation(interaction.getMessageSignature().getOperation()); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java 2011-02-10 18:11:03 UTC (rev 647) @@ -62,6 +62,12 @@ Marshaller marshaller = context.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + // SAVARA-175 - it seems that to get jaxb to generate the namespace prefix + // mapping at the top of the document, it is necessary to (1) have the TProcess + // created with the original namespace prefix mappings, which on initial + // marshalling will be moved on to the elements that have the prefix, and + // then (2) reapply the prefixes by building the DOM, adding the prefix + // namespace info, and then transforming back to text. if (prefixes != null) { java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); @@ -70,7 +76,7 @@ // Convert to DOM javax.xml.parsers.DocumentBuilderFactory dbfactory= javax.xml.parsers.DocumentBuilderFactory.newInstance(); - dbfactory.setNamespaceAware(true); + dbfactory.setNamespaceAware(false); org.w3c.dom.Document doc= dbfactory.newDocumentBuilder().parse(new java.io.ByteArrayInputStream(baos.toByteArray())); @@ -81,13 +87,15 @@ doc.getDocumentElement().setAttribute("xmlns:"+prefix, ns); } + java.io.ByteArrayOutputStream baos2=new java.io.ByteArrayOutputStream(); + javax.xml.transform.dom.DOMSource source=new javax.xml.transform.dom.DOMSource(doc); javax.xml.transform.stream.StreamResult result=new javax.xml.transform.stream.StreamResult(os); javax.xml.transform.Transformer transformer= javax.xml.transform.TransformerFactory.newInstance().newTransformer(); transformer.transform(source, result); - + } else { marshaller.marshal(factory.createProcess(desc), os); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-02-10 18:11:03 UTC (rev 647) @@ -37,6 +37,7 @@ TestSuite suite = new TestSuite("Protocol->BPEL Generator Tests"); suite.addTest(new ProtocolToBPELTester("ESBBroker", "Broker")); + suite.addTest(new ProtocolToBPELTester("ESBBroker", "Buyer")); suite.addTest(new ProtocolToBPELTester("ESBBroker", "SupplierTxnProcessor")); suite.addTest(new ProtocolToBPELTester("ESBBroker", "CreditAgency")); @@ -50,7 +51,7 @@ suite.addTest(new ProtocolToBPELTester("ReqRespFault", "Seller")); suite.addTest(new ProtocolToBPELTester("PolicyQuote", "PolicyQuoteProcessService")); - + return suite; } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/util/BPELModelUtilTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/util/BPELModelUtilTest.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/util/BPELModelUtilTest.java 2011-02-10 18:11:03 UTC (rev 647) @@ -99,7 +99,102 @@ } } catch(Exception e) { - fail("Failed to deserialise BPEL process: "+e); + fail("Failed to serialise BPEL process: "+e); } } + + public void testSerialize2() { + try { + String process="<?xml version=\"1.0\" encoding=\"UTF-8\"?><process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\" xmlns:test=\"http://www.savara.org/schema\">\r\n"+ + " <variables>\r\n"+ + " <variable messageType=\"test:receivePolicyQuoteRequest\" name=\"policyQuoteVar\"/>\r\n"+ + " <variable messageType=\"test:receivePolicyQuoteRequest2\" name=\"policyQuoteVar2\"/>\r\n"+ + " </variables>\r\n"+ + "</process>"; + + TProcess desc=BPELModelUtil.deserialize(new java.io.ByteArrayInputStream(process.getBytes())); + + java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream(); + + java.util.Map<String,String> prefixes=new java.util.HashMap<String, String>(); + prefixes.put("http://www.savara.org/schema";, "test"); + + BPELModelUtil.serialize(desc, os, prefixes); + + String str=os.toString(); + str = str.replaceAll("\r\n", "\n"); + + process = process.replaceAll("\r\n", "\n"); + + if (process.equals(str) == false) { + System.out.println("BPEL="+process); + System.out.println("SERIALIZED="+str); + fail("Serialized version does not match"); + } + } catch(Exception e) { + fail("Failed to serialise BPEL process: "+e); + } + } + + public void testSerialize3() { + try { + String process="<?xml version=\"1.0\" encoding=\"UTF-8\"?><process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\" xmlns:test=\"http://www.savara.org/schema\"/>"; + + TProcess desc=BPELModelUtil.deserialize(new java.io.ByteArrayInputStream(process.getBytes())); + + java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream(); + + java.util.Map<String,String> prefixes=new java.util.HashMap<String, String>(); + prefixes.put("http://www.savara.org/schema";, "test"); + + BPELModelUtil.serialize(desc, os, prefixes); + + String str=os.toString(); + str = str.replaceAll("\r\n", "\n"); + + process = process.replaceAll("\r\n", "\n"); + + if (process.equals(str) == false) { + System.out.println("BPEL="+process); + System.out.println("SERIALIZED="+str); + fail("Serialized version does not match"); + } + } catch(Exception e) { + fail("Failed to serialise BPEL process: "+e); + } + } + + public void testSerialize4() { + try { + String process="<?xml version=\"1.0\" encoding=\"UTF-8\"?><process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\" xmlns:test=\"http://www.savara.org/schema\">\r\n"+ + " <variables>\r\n"+ + " <variable messageType=\"test:receivePolicyQuoteRequest\" name=\"policyQuoteVar\"/>\r\n"+ + " <variable xmlns:other=\"http://www.savara.org/schema\" messageType=\"other:receivePolicyQuoteRequest2\" name=\"policyQuoteVar2\"/>\r\n"+ + " </variables>\r\n"+ + "</process>"; + + TProcess desc=BPELModelUtil.deserialize(new java.io.ByteArrayInputStream(process.getBytes())); + + java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream(); + + java.util.Map<String,String> prefixes=new java.util.HashMap<String, String>(); + prefixes.put("http://www.savara.org/schema";, "test"); + + BPELModelUtil.serialize(desc, os, prefixes); + + String str=os.toString(); + str = str.replaceAll("\r\n", "\n"); + + process = process.replaceAll("\r\n", "\n"); + + if (process.equals(str) == false) { + System.out.println("BPEL="+process); + System.out.println("SERIALIZED="+str); + fail("Serialized version does not match"); + } + } catch(Exception e) { + fail("Failed to serialise BPEL process: "+e); + } + } + } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Broker.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Broker.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Broker.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,15 +1,14 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Broker"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BrokerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> <partnerLinks> - <partnerLink myRole="Broker" partnerLinkType="brk:BuyerToBrokerServiceLT" name="BuyerToBroker"/> - <partnerLink partnerRole="SupplierQuoteEngineRequester" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" name="BrokerToSupplierQuoteEngine"/> - <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="brk:BrokerToCreditAgencyLT" name="BrokerToCreditAgency"/> - <partnerLink partnerRole="SupplierTxnProcessorRequester" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" name="BrokerToSupplierTxnProcessor"/> + <partnerLink myRole="Broker" name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT"/> + <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/> + <partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/> </partnerLinks> <variables> <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> @@ -26,39 +25,39 @@ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> </variables> <sequence> - <receive createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Receive_Enquiry"/> + <receive createInstance="yes" name="Receive_Enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:Broker" variable="makeEnquiryRequestVar"/> <while> <sequence> <scope> <sequence> - <invoke outputVariable="getQuoteResponseVar" inputVariable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Send_RequestForQuote"/> + <invoke inputVariable="getQuoteRequestVar" name="Send_RequestForQuote" operation="getQuote" outputVariable="getQuoteResponseVar" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierQuoteEngine"/> </sequence> </scope> </sequence> </while> - <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_QuoteList"/> + <reply name="Send_QuoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:Broker" variable="makeEnquiryResponseVar"/> <pick> - <onMessage variable="buyRequestVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker"> + <onMessage operation="buy" partnerLink="BuyerToBroker" portType="brk:Broker" variable="buyRequestVar"> <sequence> <scope> <faultHandlers> - <catch faultMessageType="cay:invalidCreditFault" faultVariable="invalidCreditFaultVar" faultName="cay:invalidCredit"> + <catch faultMessageType="cay:invalidCreditFault" faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar"> <sequence> - <reply faultName="brk:rejected" variable="rejectedFaultVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_OrderRejected"/> + <reply faultName="brk:rejected" name="Send_OrderRejected" operation="buy" partnerLink="BuyerToBroker" portType="brk:Broker" variable="rejectedFaultVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInformation"/> - <invoke outputVariable="confirmResponseVar" inputVariable="confirmRequestVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Send_OrderConfirmed"/> - <reply variable="buyResponseVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_BookingReference"/> + <invoke inputVariable="checkCreditRequestVar" name="Send_CreditInformation" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgency"/> + <invoke inputVariable="confirmRequestVar" name="Send_OrderConfirmed" operation="confirm" outputVariable="confirmResponseVar" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierTxnProcessor"/> + <reply name="Send_BookingReference" operation="buy" partnerLink="BuyerToBroker" portType="brk:Broker" variable="buyResponseVar"/> </sequence> </scope> </sequence> </onMessage> - <onMessage variable="cancelRequestVar" operation="cancel" portType="brk:Broker" partnerLink="BuyerToBroker"> + <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="brk:Broker" variable="cancelRequestVar"> <sequence/> </onMessage> </pick> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Buyer.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)Buyer.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" name="ESBBrokerProcess_Buyer"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> <partnerLinks> - <partnerLink partnerRole="BrokerRequester" partnerLinkType="byr:BuyerToBrokerLT" name="BuyerToBroker"/> + <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/> </partnerLinks> <variables> <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> @@ -13,25 +12,25 @@ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> </variables> <sequence> - <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_Enquiry"/> + <invoke inputVariable="makeEnquiryRequestVar" name="Send_Enquiry" operation="makeEnquiry" outputVariable="makeEnquiryResponseVar" partnerLink="BuyerToBroker" portType="brk:Broker"/> <if> <sequence> <scope> <faultHandlers> - <catch faultMessageType="brk:rejectedFault" faultVariable="rejectedFaultVar" faultName="brk:rejected"> + <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_Buy"/> + <invoke inputVariable="buyRequestVar" name="Send_Buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:Broker"/> </sequence> </scope> </sequence> <else> <sequence> - <invoke inputVariable="cancelRequestVar" operation="cancel" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_Cancel"/> + <invoke inputVariable="cancelRequestVar" name="Send_Cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:Broker"/> </sequence> </else> </if> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)CreditAgency.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)CreditAgency.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,12 +1,11 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" name="ESBBrokerProcess_CreditAgency"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> <partnerLinks> - <partnerLink myRole="CreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" name="BrokerToCreditAgency"/> + <partnerLink myRole="CreditAgency" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> @@ -14,16 +13,16 @@ <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Receive_CreditInformation"/> + <receive createInstance="yes" name="Receive_CreditInformation" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgency" variable="checkCreditRequestVar"/> <if> <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditValid"/> + <reply name="Send_CreditValid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgency" variable="checkCreditResponseVar"/> </sequence> <else> <sequence> - <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInvalid"/> + <reply faultName="cay:invalidCredit" name="Send_CreditInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgency" variable="invalidCreditFaultVar"/> </sequence> </else> </if> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierQuoteEngine.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierQuoteEngine.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierQuoteEngine.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,16 +1,15 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="RequestForQuote_SupplierQuoteEngine"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <partnerLinks> - <partnerLink myRole="SupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/> + <partnerLink myRole="SupplierQuoteEngine" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/> </partnerLinks> <variables> <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> </variables> <sequence> - <receive createInstance="yes" variable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Receive_RequestForQuote"/> - <reply variable="getQuoteResponseVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Send_Quote"/> + <receive createInstance="yes" name="Receive_RequestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierQuoteEngine" variable="getQuoteRequestVar"/> + <reply name="Send_Quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierQuoteEngine" variable="getQuoteResponseVar"/> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierTxnProcessor.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierTxnProcessor.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker(a)SupplierTxnProcessor.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,19 +1,18 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="ESBBrokerProcess_SupplierTxnProcessor"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ESBBrokerProcess_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> <partnerLinks> - <partnerLink myRole="SupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" name="BrokerToSupplierTxnProcessor"/> + <partnerLink myRole="SupplierTxnProcessor" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/> </partnerLinks> <variables> <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> </variables> <sequence> - <receive createInstance="yes" variable="confirmRequestVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Receive_OrderConfirmed"/> - <reply variable="confirmResponseVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Send_BookingReference"/> + <receive createInstance="yes" name="Receive_OrderConfirmed" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierTxnProcessor" variable="confirmRequestVar"/> + <reply name="Send_BookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierTxnProcessor" variable="confirmResponseVar"/> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote(a)PolicyQuoteProcessService.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote(a)PolicyQuoteProcessService.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote(a)PolicyQuoteProcessService.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pcs="http://www.example.org/policyQuoteCalculationService" xmlns:pes="http://www.example.org/policyQuoteEntityService" xmlns:drv="http://dmv.com/drivingRecord" xmlns:tns="http://www.pi4soa.org/PolicyQuote" xmlns:cred="http://creditagency.com/creditCheck" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:pol="http://www.example.org/policyQuote" xmlns:pps="http://www.example.org/policyQuoteProcessService" xmlns:ca="http://creditagency.com/creditCheckService" xmlns:dmv="http://dmv.com/drivingRecordService" targetNamespace="http://www.example.org/policyQuoteProcessService" name="PolicyQuoteProcess_PolicyQuoteProcessService"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:ca="http://creditagency.com/creditCheckService" xmlns:cred="http://creditagency.com/creditCheck" xmlns:dmv="http://dmv.com/drivingRecordService" xmlns:drv="http://dmv.com/drivingRecord" xmlns:pcs="http://www.example.org/policyQuoteCalculationService" xmlns:pes="http://www.example.org/policyQuoteEntityService" xmlns:pol="http://www.example.org/policyQuote" xmlns:pps="http://www.example.org/policyQuoteProcessService" xmlns:tns="http://www.pi4soa.org/PolicyQuote" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PolicyQuoteProcess_PolicyQuoteProcessService" targetNamespace="http://www.example.org/policyQuoteProcessService&qu... <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_PolicyQuoteProcessService.wsdl" namespace="http://www.example.org/policyQuoteProcessService"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_Driver.wsdl" namespace="http://www.pi4soa.org/PolicyQuote"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_CreditCheckService.wsdl" namespace="http://creditagency.com/creditCheckService"/> @@ -8,12 +7,12 @@ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_PolicyQuoteEntityService.wsdl" namespace="http://www.example.org/policyQuoteEntityService"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_PolicyQuoteProcessServiceArtifacts.wsdl" namespace="http://www.example.org/policyQuoteProcessService"/> <partnerLinks> - <partnerLink myRole="PolicyQuoteProcessService" partnerLinkType="pps:DriverToPolicyQuoteProcessServiceServiceLT" name="DriverToPolicyQuoteProcessService"/> - <partnerLink partnerRole="DrivingRecordServiceRequester" partnerLinkType="pps:PolicyQuoteProcessServiceToDrivingRecordServiceLT" name="PolicyQuoteProcessServiceToDrivingRecordService"/> - <partnerLink myRole="PolicyQuoteProcessService" partnerLinkType="pps:DrivingRecordServiceToPolicyQuoteProcessServiceServiceLT" name="DrivingRecordServiceToPolicyQuoteProcessService"/> - <partnerLink partnerRole="CreditCheckServiceRequester" partnerLinkType="pps:PolicyQuoteProcessServiceToCreditCheckServiceLT" name="PolicyQuoteProcessServiceToCreditCheckService"/> - <partnerLink partnerRole="PolicyQuoteCalculationServiceRequester" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteCalculationServiceLT" name="PolicyQuoteProcessServiceToPolicyQuoteCalculationService"/> - <partnerLink partnerRole="PolicyQuoteEntityServiceRequester" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteEntityServiceLT" name="PolicyQuoteProcessServiceToPolicyQuoteEntityService"/> + <partnerLink myRole="PolicyQuoteProcessService" name="DriverToPolicyQuoteProcessService" partnerLinkType="pps:DriverToPolicyQuoteProcessServiceServiceLT"/> + <partnerLink name="PolicyQuoteProcessServiceToDrivingRecordService" partnerLinkType="pps:PolicyQuoteProcessServiceToDrivingRecordServiceLT" partnerRole="DrivingRecordServiceRequester"/> + <partnerLink myRole="PolicyQuoteProcessService" name="DrivingRecordServiceToPolicyQuoteProcessService" partnerLinkType="pps:DrivingRecordServiceToPolicyQuoteProcessServiceServiceLT"/> + <partnerLink name="PolicyQuoteProcessServiceToCreditCheckService" partnerLinkType="pps:PolicyQuoteProcessServiceToCreditCheckServiceLT" partnerRole="CreditCheckServiceRequester"/> + <partnerLink name="PolicyQuoteProcessServiceToPolicyQuoteCalculationService" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteCalculationServiceLT" partnerRole="PolicyQuoteCalculationServiceRequester"/> + <partnerLink name="PolicyQuoteProcessServiceToPolicyQuoteEntityService" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteEntityServiceLT" partnerRole="PolicyQuoteEntityServiceRequester"/> </partnerLinks> <variables> <variable messageType="pps:receivePolicyQuoteRequest" name="receivePolicyQuoteRequestVar"/> @@ -29,21 +28,21 @@ <variable messageType="pps:policyQuoteFaultFault" name="policyQuoteFaultFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="receivePolicyQuoteRequestVar" operation="receivePolicyQuote" portType="pps:PolicyQuoteProcessService" partnerLink="DriverToPolicyQuoteProcessService" name="Receive_PolicyQuote"/> - <invoke inputVariable="checkDrivingRecordRequestVar" operation="checkDrivingRecord" portType="dmv:DrivingRecordService" partnerLink="PolicyQuoteProcessServiceToDrivingRecordService" name="Send_DrivingRecordRequest"/> - <receive variable="receiveDrivingRecordRequestVar" operation="receiveDrivingRecord" portType="pps:PolicyQuoteProcessService" partnerLink="DrivingRecordServiceToPolicyQuoteProcessService" name="Receive_DrivingRecordResponse"/> + <receive createInstance="yes" name="Receive_PolicyQuote" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="receivePolicyQuoteRequestVar"/> + <invoke inputVariable="checkDrivingRecordRequestVar" name="Send_DrivingRecordRequest" operation="checkDrivingRecord" partnerLink="PolicyQuoteProcessServiceToDrivingRecordService" portType="dmv:DrivingRecordService"/> + <receive name="Receive_DrivingRecordResponse" operation="receiveDrivingRecord" partnerLink="DrivingRecordServiceToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="receiveDrivingRecordRequestVar"/> <if> <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="ca:CreditCheckService" partnerLink="PolicyQuoteProcessServiceToCreditCheckService" name="Send_CreditCheckRequest"/> - <invoke outputVariable="calculatePolicyQuoteResponseVar" inputVariable="calculatePolicyQuoteRequestVar" operation="calculatePolicyQuote" portType="pcs:PolicyQuoteCalculationService" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteCalculationService" name="Send_PolicyQuote"/> - <invoke outputVariable="createPolicyQuoteResponseVar" inputVariable="createPolicyQuoteRequestVar" operation="createPolicyQuote" portType="pes:PolicyQuoteEntityService" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteEntityService" name="Send_PolicyQuote"/> - <reply variable="receivePolicyQuoteResponseVar" operation="receivePolicyQuote" portType="pps:PolicyQuoteProcessService" partnerLink="DriverToPolicyQuoteProcessService" name="Send_PolicyQuoteReply"/> + <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="PolicyQuoteProcessServiceToCreditCheckService" portType="ca:CreditCheckService"/> + <invoke inputVariable="calculatePolicyQuoteRequestVar" name="Send_PolicyQuote" operation="calculatePolicyQuote" outputVariable="calculatePolicyQuoteResponseVar" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteCalculationService" portType="pcs:PolicyQuoteCalculationService"/> + <invoke inputVariable="createPolicyQuoteRequestVar" name="Send_PolicyQuote" operation="createPolicyQuote" outputVariable="createPolicyQuoteResponseVar" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteEntityService" portType="pes:PolicyQuoteEntityService"/> + <reply name="Send_PolicyQuoteReply" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="receivePolicyQuoteResponseVar"/> </sequence> <else> <sequence> - <reply faultName="pps:policyQuoteFault" variable="policyQuoteFaultFaultVar" operation="receivePolicyQuote" portType="pps:PolicyQuoteProcessService" partnerLink="DriverToPolicyQuoteProcessService" name="Send_PolicyQuoteFault"/> + <reply faultName="pps:policyQuoteFault" name="Send_PolicyQuoteFault" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="policyQuoteFaultFaultVar"/> </sequence> </else> </if> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Buyer.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Buyer.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="http://www.jboss.org/savara/examples" name="PurchaseGoodsProcess_Buyer"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/> <partnerLinks> - <partnerLink partnerRole="StoreRequester" partnerLinkType="tns:BuyerToStoreLT" name="BuyerToStore"/> + <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/> </partnerLinks> <variables> <variable messageType="sto:buyRequest" name="buyRequestVar"/> @@ -12,13 +11,13 @@ <sequence> <scope> <faultHandlers> - <catch faultMessageType="sto:BuyFailedFault" faultVariable="BuyFailedFaultVar" faultName="sto:BuyFailed"> + <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyRequest"/> + <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:Store"/> </sequence> </scope> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)CreditAgency.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)CreditAgency.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)CreditAgency.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,10 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_CreditAgency"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Buyer.wsdl" namespace="http://www.jboss.org/savara/examples"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> <partnerLinks> - <partnerLink myRole="CreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/> + <partnerLink myRole="CreditAgency" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/> </partnerLinks> <variables> <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> @@ -12,16 +11,16 @@ <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/> + <receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgency" variable="checkCreditRequestVar"/> <if> <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/> + <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgency" variable="checkCreditResponseVar"/> </sequence> <else> <sequence> - <reply faultName="pur:CreditCheckFailed" variable="CreditCheckFailedFaultVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/> + <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgency" variable="CreditCheckFailedFaultVar"/> </sequence> </else> </if> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Store.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Store.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods(a)Store.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,11 +1,10 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="http://www.jboss.org/examples/store" name="PurchaseGoodsProcess_Store"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" namespace="http://www.jboss.org/examples/store"/> <partnerLinks> - <partnerLink myRole="Store" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/> - <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="sto:StoreToCreditAgencyLT" name="StoreToCreditAgency"/> + <partnerLink myRole="Store" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> </partnerLinks> <variables> <variable messageType="sto:buyRequest" name="buyRequestVar"/> @@ -15,19 +14,19 @@ <variable messageType="sto:BuyFailedFault" name="BuyFailedFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="buyRequestVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Receive_BuyRequest"/> + <receive createInstance="yes" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:Store" variable="buyRequestVar"/> <scope> <faultHandlers> - <catch faultMessageType="pur:CreditCheckFailedFault" faultVariable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed"> + <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar"> <sequence> - <reply faultName="sto:BuyFailed" variable="BuyFailedFaultVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyFailed"/> + <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:Store" variable="BuyFailedFaultVar"/> </sequence> </catch> </faultHandlers> <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckRequest"/> - <reply variable="buyResponseVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyConfirmed"/> + <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgency"/> + <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" portType="sto:Store" variable="buyResponseVar"/> </sequence> </scope> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Buyer.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Buyer.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Buyer.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" name="ReqRespFaultProcess_Buyer"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/> <partnerLinks> - <partnerLink partnerRole="SellerRequester" partnerLinkType="byr:BuyerToSellerLT" name="BuyerToSeller"/> + <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/> </partnerLinks> <variables> <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> @@ -12,13 +11,13 @@ <sequence> <scope> <faultHandlers> - <catch faultMessageType="slr:insufficientCreditFault" faultVariable="insufficientCreditFaultVar" faultName="slr:insufficientCredit"> + <catch faultMessageType="slr:insufficientCreditFault" faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar"> <sequence/> </catch> </faultHandlers> <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInformation"/> + <invoke inputVariable="checkCreditRequestVar" name="Send_CreditInformation" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller" portType="slr:Seller"/> </sequence> </scope> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Seller.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Seller.bpel 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault(a)Seller.bpel 2011-02-10 18:11:03 UTC (rev 647) @@ -1,9 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Seller"> +<?xml version="1.0" encoding="UTF-8"?><process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_SellerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> <partnerLinks> - <partnerLink myRole="Seller" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/> + <partnerLink myRole="Seller" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/> </partnerLinks> <variables> <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> @@ -11,16 +10,16 @@ <variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Receive_CreditInformation"/> + <receive createInstance="yes" name="Receive_CreditInformation" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:Seller" variable="checkCreditRequestVar"/> <if> <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditValid"/> + <reply name="Send_CreditValid" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:Seller" variable="checkCreditResponseVar"/> </sequence> <else> <sequence> - <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInvalid"/> + <reply faultName="slr:insufficientCredit" name="Send_CreditInvalid" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:Seller" variable="insufficientCreditFaultVar"/> </sequence> </else> </if> </sequence> -</process> +</process> \ No newline at end of file Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-02-10 18:11:03 UTC (rev 647) @@ -84,7 +84,38 @@ return(ret); } + /** + * This method returns the annotation, from the supplied list, with the + * supplied name and property details. + * + * @param annotations The list of annotations + * @param name The annotation name + * @param propName The property name + * @param propValue The property value + * @return The annotation, or null if not found + */ + public static Annotation getAnnotationWithProperty(java.util.List<org.scribble.common.model.Annotation> annotations, + String name, String propName, Object propValue) { + Annotation ret=null; + + for (org.scribble.common.model.Annotation an : annotations) { + if (an instanceof Annotation && ((Annotation)an).getName().equals(name)) { + ret = (Annotation)an; + + if (ret.getProperties().containsKey(propName) && + ret.getProperties().get(propName).equals(propValue)) { + break; + } else { + ret = null; + } + } + } + + return(ret); + } + + /** * This method returns the list of annotations, from the supplied list, with the * supplied name. * Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolUtils.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolUtils.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolUtils.java 2011-02-10 18:11:03 UTC (rev 647) @@ -17,8 +17,11 @@ */ package org.savara.protocol.util; +import org.savara.common.model.annotation.Annotation; +import org.savara.common.model.annotation.AnnotationDefinitions; import org.scribble.protocol.model.ModelObject; import org.scribble.protocol.model.ModelProperties; +import org.scribble.protocol.model.ProtocolModel; /** * This class defines a set of protocol related utility functions. @@ -96,4 +99,25 @@ } } } + + /** + * This method finds a prefix associated with a supplied namespace using the + * type annotation information associated with a protocol model. + * + * @param model The model + * @param namespace The namespace + * @return The prefix, or null if not found + */ + public static String getNamespacePrefix(ProtocolModel model, String namespace) { + Annotation annotation=null; + + if (model != null && model.getProtocol() != null) { + annotation = AnnotationDefinitions.getAnnotationWithProperty( + model.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE, + AnnotationDefinitions.NAMESPACE_PROPERTY, namespace); + } + + return(annotation == null ? null : + (String)annotation.getProperties().get(AnnotationDefinitions.PREFIX_PROPERTY)); + } } Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-10 18:11:03 UTC (rev 647) @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.savara.protocol.model.util.PropertyName; import org.savara.protocol.model.util.TypeSystem; +import org.savara.protocol.util.ProtocolUtils; import org.savara.common.model.annotation.AnnotationDefinitions; import org.savara.contract.model.FaultDetails; import org.savara.contract.model.Interface; @@ -323,7 +324,7 @@ ret.setName(mep.getOperation()); QName msgname=WSDLGeneratorUtil.getRequestMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); + mep.getOperation(), null); javax.wsdl.Message mesg=getMessage(wsdls, contract, msgname, mep.getTypes(), wsdlBinding); @@ -339,7 +340,7 @@ RequestResponseMEP rr=(RequestResponseMEP)mep; msgname=WSDLGeneratorUtil.getResponseMessageType(portType.getQName().getNamespaceURI(), - mep.getOperation()); + mep.getOperation(), null); javax.wsdl.Message om=getMessage(wsdls, contract, msgname, rr.getResponseTypes(), wsdlBinding); @@ -355,7 +356,7 @@ FaultDetails fd=rr.getFaultDetails().get(i); msgname = WSDLGeneratorUtil.getFaultMessageType(portType.getQName().getNamespaceURI(), - fd.getName()); + fd.getName(), null); javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, fd.getTypes(), wsdlBinding); @@ -410,7 +411,7 @@ ret.setName(mep.getOperation()); QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); + mep.getOperation(), null); javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname, mep.getTypes(), wsdlBinding); @@ -431,7 +432,7 @@ RequestResponseMEP rr=(RequestResponseMEP)mep; msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(), - mep.getOperation()); + mep.getOperation(), null); javax.wsdl.Message om=getMessage(wsdls, contract, msgname, rr.getResponseTypes(), wsdlBinding); @@ -452,7 +453,7 @@ FaultDetails fd=rr.getFaultDetails().get(i); msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(), - fd.getName()); + fd.getName(), null); javax.wsdl.Message fm=getMessage(wsdls, contract, msgname, fd.getTypes(), wsdlBinding); Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/util/WSDLGeneratorUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/util/WSDLGeneratorUtil.java 2011-02-10 12:32:24 UTC (rev 646) +++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/util/WSDLGeneratorUtil.java 2011-02-10 18:11:03 UTC (rev 647) @@ -32,10 +32,17 @@ * * @param intfNamespace The interface namespace * @param op The operation name + * @param prefix The optional prefix * @return The request message type */ - public static javax.xml.namespace.QName getRequestMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+REQUEST)); + public static javax.xml.namespace.QName getRequestMessageType(String intfNamespace, String op, String prefix) { + javax.xml.namespace.QName ret=null; + if (prefix != null) { + ret = new javax.xml.namespace.QName(intfNamespace, op+REQUEST, prefix); + } else { + ret = new javax.xml.namespace.QName(intfNamespace, op+REQUEST); + } + return(ret); } /** @@ -43,10 +50,17 @@ * * @param intfNamespace The interface namespace * @param op The operation name + * @param prefix The optional prefix * @return The response message type */ - public static javax.xml.namespace.QName getResponseMessageType(String intfNamespace, String op) { - return(new javax.xml.namespace.QName(intfNamespace, op+RESPONSE)); + public static javax.xml.namespace.QName getResponseMessageType(String intfNamespace, String op, String prefix) { + javax.xml.namespace.QName ret=null; + if (prefix != null) { + ret = new javax.xml.namespace.QName(intfNamespace, op+RESPONSE, prefix); + } else { + ret = new javax.xml.namespace.QName(intfNamespace, op+RESPONSE); + } + return(ret); } /** @@ -54,9 +68,16 @@ * * @param intfNamespace The interface namespace * @param faultName The fault name + * @param prefix The optional prefix * @return The fault message type */ - public static javax.xml.namespace.QName getFaultMessageType(String intfNamespace, String faultName) { - return(new javax.xml.namespace.QName(intfNamespace, faultName+FAULT)); + public static javax.xml.namespace.QName getFaultMessageType(String intfNamespace, String faultName, String prefix) { + javax.xml.namespace.QName ret=null; + if (prefix != null) { + ret = new javax.xml.namespace.QName(intfNamespace, faultName+FAULT, prefix); + } else { + ret = new javax.xml.namespace.QName(intfNamespace, faultName+FAULT); + } + return(ret); } }