savara SVN: r649 - branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-10 17:03:36 -0500 (Thu, 10 Feb 2011)
New Revision: 649
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
Log:
Obtain contract for the roles, to define the port type for the partner link type.
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-10 20:00:20 UTC (rev 648)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-10 22:03:36 UTC (rev 649)
@@ -565,9 +565,15 @@
while (roles.hasNext()) {
Role r=roles.next();
- if (r != null && r.getProperties().containsKey(Contract.class.getName())) {
- Contract contract=(Contract)r.getProperties().get(Contract.class.getName());
-
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ Contract contract=null;
+
+ if (cg != null) {
+ CachedJournal journal=new CachedJournal();
+ contract=cg.generate(m_protocolModel.getProtocol(), null, r, journal);
+ }
+
+ if (contract != null) {
boolean gen=false;
java.util.Iterator<Interface> iter=contract.getInterfaces().iterator();
@@ -617,9 +623,15 @@
}
}
- if (useRole != null &&
- useRole.getProperties().containsKey(Contract.class.getName())) {
- Contract contract=(Contract)useRole.getProperties().get(Contract.class.getName());
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ Contract contract=null;
+
+ if (cg != null && useRole != null) {
+ CachedJournal journal=new CachedJournal();
+ contract=cg.generate(m_protocolModel.getProtocol(), null, useRole, journal);
+ }
+
+ if (contract != null) {
Interface intf=null;
if (pl.getMyRole() != null) {
@@ -652,8 +664,15 @@
plRole.setAttribute(NAME_LABEL, pl.getMyRole());
- if (role.getProperties().containsKey(Contract.class.getName())) {
- Contract contract=(Contract)role.getProperties().get(Contract.class.getName());
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ Contract contract=null;
+
+ if (cg != null) {
+ CachedJournal journal=new CachedJournal();
+ contract=cg.generate(m_protocolModel.getProtocol(), null, role, journal);
+ }
+
+ if (contract != null) {
Interface intf=null;
if (pl.getMyRole() != null) {
15 years, 2 months
- 1
- 0
savara SVN: r648 - in branches/experimental/2.0.x/bundles: org.savara.contract/src/main/java/org/savara/contract/model and 10 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-10 15:00:20 -0500 (Thu, 10 Feb 2011)
New Revision: 648
Added:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMToProtocolParserTest.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/cdm/
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/spr/
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.contract/src/main/java/org/savara/contract/model/Interface.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)Broker.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)CreditAgency.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierQuoteEngine.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierTxnProcessor.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ReqRespFault(a)Seller.contract
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/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl
Log:
Pass xsd element/type information through to contract, to enable the generated WSDL to define the correct attribute on the message part.
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 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/annotation/AnnotationDefinitions.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -71,7 +71,7 @@
* @param name The name
* @return The annotation, or null if not found
*/
- public static Annotation getAnnotation(java.util.List<org.scribble.common.model.Annotation> annotations,
+ public static Annotation getAnnotation(java.util.List<? extends org.scribble.common.model.Annotation> annotations,
String name) {
Annotation ret=null;
@@ -95,7 +95,7 @@
* @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,
+ public static Annotation getAnnotationWithProperty(java.util.List<? extends org.scribble.common.model.Annotation> annotations,
String name, String propName, Object propValue) {
Annotation ret=null;
@@ -123,7 +123,7 @@
* @param name The name
* @return The annotations with the specified name
*/
- public static java.util.List<Annotation> getAnnotations(java.util.List<org.scribble.common.model.Annotation> annotations,
+ public static java.util.List<Annotation> getAnnotations(java.util.List<? extends org.scribble.common.model.Annotation> annotations,
String name) {
java.util.List<Annotation> ret=new java.util.Vector<Annotation>();
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -17,6 +17,8 @@
*/
package org.savara.contract.model;
+import org.savara.common.model.annotation.Annotation;
+
/**
* This class represents an interface, as part of a contract.
*
@@ -107,6 +109,10 @@
public String toString() {
StringBuffer buf=new StringBuffer();
+ for (Annotation ann : getAnnotations()) {
+ buf.append("\t[["+ann+"]]\r\n");
+ }
+
buf.append("\tInterface {"+m_namespace+"}"+m_name+" {\r\n");
for (MessageExchangePattern mep : getMessageExchangePatterns()) {
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -17,6 +17,8 @@
*/
package org.savara.contract.model;
+import org.savara.common.model.annotation.Annotation;
+
/**
* This class represents the one-way message exchange pattern.
*/
@@ -31,6 +33,10 @@
public String toString() {
StringBuffer buf=new StringBuffer();
+ for (Annotation ann : getAnnotations()) {
+ buf.append("\t\t[["+ann+"]]\r\n");
+ }
+
buf.append("\t\tOneWayRequestMEP "+getOperation()+"( ");
for (Type t : getTypes()) {
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -17,6 +17,8 @@
*/
package org.savara.contract.model;
+import org.savara.common.model.annotation.Annotation;
+
/**
* This class represents the request response message exchange pattern.
*/
@@ -70,6 +72,10 @@
public String toString() {
StringBuffer buf=new StringBuffer();
+ for (Annotation ann : getAnnotations()) {
+ buf.append("\t\t[["+ann+"]]\r\n");
+ }
+
buf.append("\t\tRequestResponseMEP "+getOperation()+"( ");
for (Type t : getTypes()) {
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -17,6 +17,8 @@
*/
package org.savara.contract.model;
+import org.savara.common.model.annotation.Annotation;
+
/**
* This class represents a type definition within
*/
@@ -111,7 +113,15 @@
}
public String toString() {
- return("\tTypeDef "+m_name+" type="+m_dataType+
+ StringBuffer buf=new StringBuffer();
+
+ for (Annotation ann : getAnnotations()) {
+ buf.append("\t[["+ann+"]]\r\n");
+ }
+
+ buf.append("\tTypeDef "+m_name+" type="+m_dataType+
" location="+m_location+" typeSystem="+m_typeSystem+"\r\n");
+
+ return(buf.toString());
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -169,11 +169,15 @@
org.pi4soa.common.xml.XMLPrefixResolver resolver=
org.pi4soa.cdl.util.CDLTypeUtil.getPrefixResolver(infoType.getPackage());
String typeName=null;
+ Annotation xsdAnnotation=null;
if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getTypeName())) {
typeName = infoType.getTypeName();
+ xsdAnnotation = new Annotation(AnnotationDefinitions.XSD_TYPE);
+
} else if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getElementName())) {
typeName = infoType.getElementName();
+ xsdAnnotation = new Annotation(AnnotationDefinitions.XSD_ELEMENT);
}
if (typeName != null) {
@@ -199,7 +203,9 @@
if ((tilist.getLocation() == null && location == null) ||
(tilist.getLocation() != null && location != null &&
- tilist.getLocation().equals(location))) {
+ tilist.getLocation().equals(location)) &&
+ AnnotationDefinitions.getAnnotation(tilist.getAnnotations(),
+ xsdAnnotation.getName()) != null) {
til = tilist;
break;
}
@@ -211,6 +217,8 @@
til.setFormat(TypeSystem.XSD);
til.setLocation(location);
+ til.getAnnotations().add(xsdAnnotation);
+
model.getImports().add(til);
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,92 +0,0 @@
-package org.savara.pi4soa.cdm.parser;
-
-import static org.junit.Assert.*;
-
-import org.savara.protocol.util.ProtocolServices;
-import org.scribble.common.logging.Journal;
-import org.scribble.protocol.model.ProtocolModel;
-
-public class CDMProtocolParserTest {
-
- public ProtocolModel getModel(String filename, Journal logger) {
- ProtocolModel ret=null;
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is == null) {
- fail("Failed to load protocol '"+filename+"'");
- }
-
- org.scribble.protocol.parser.ProtocolParser parser=
- new org.savara.pi4soa.cdm.parser.CDMProtocolParser();
-
- try {
- ret = parser.parse(is, logger, null);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- return(ret);
- }
-
- public void verify(ProtocolModel model, String sprFile) {
- TestJournal journal=new TestJournal();
-
- org.scribble.protocol.export.text.TextProtocolExporter exporter=
- new org.scribble.protocol.export.text.TextProtocolExporter();
-
- try {
- java.io.ByteArrayOutputStream os=
- new java.io.ByteArrayOutputStream();
-
- exporter.export(model, journal, os);
-
- String spr=new String(os.toByteArray());
-
- spr = spr.replaceAll("\r\n", "\n");
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(sprFile);
-
- if (is == null) {
- fail("Failed to load scribble protocol '"+sprFile+"'");
- }
-
- byte[] b=new byte[is.available()];
-
- is.read(b);
-
- String sprText=new String(b);
-
- sprText = sprText.replaceAll("\r\n", "\n");
-
- if (spr.equals(sprText) == false) {
- System.out.println("Derived choreo=\r\n"+spr);
- fail("Protocol derived from choreography: (len="+spr.length()+")\r\n::"+spr+
- "::\r\n\r\ndoes not match expected: (len="+sprText.length()+")\r\n::"+sprText+"::");
- }
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- @org.junit.Before
- public void setup() {
- //ProtocolServices.setProtocolProjector(
- // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
- }
-
- @org.junit.Test
- public void testParse() {
- TestJournal logger=new TestJournal();
-
- ProtocolModel model=getModel("cdm/PurchaseGoods.cdm", logger);
-
- assertNotNull(model);
-
- assertTrue(logger.getErrorCount() == 0);
-
- verify(model, "spr/PurchaseGoods.spr");
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMToProtocolParserTest.java (from rev 644, branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMToProtocolParserTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMToProtocolParserTest.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -0,0 +1,213 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.pi4soa.cdm.parser;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.scribble.common.logging.CachedJournal;
+import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
+
+public class CDMToProtocolParserTest {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Choreography->Protocol Parser Tests");
+
+ suite.addTest(new ChoreographyToProtocolTester("ESBBroker"));
+ suite.addTest(new ChoreographyToProtocolTester("PolicyQuote"));
+ suite.addTest(new ChoreographyToProtocolTester("PurchaseGoods"));
+ suite.addTest(new ChoreographyToProtocolTester("ReqRespFault"));
+
+ return suite;
+ }
+
+ protected static class ChoreographyToProtocolTester extends TestCase {
+
+ private String m_name=null;
+
+ /**
+ * This constructor is initialized with the test
+ * name.
+ *
+ * @param name The test name
+ */
+ public ChoreographyToProtocolTester(String name) {
+ super(name);
+ m_name = name;
+ }
+
+ /**
+ * This method runs the test.
+ *
+ * @param result The test result
+ */
+ public void run(TestResult result) {
+ // Setup scribble services
+ //ProtocolServices.setProtocolProjector(
+ // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
+
+ // Run test
+ result.startTest(this);
+
+ String filename="testmodels/cdm/"+m_name+".cdm";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is == null) {
+ result.addError(this,
+ new Throwable("Unable to locate resource: "+filename));
+ } else {
+ CachedJournal journal=new CachedJournal();
+
+ org.scribble.protocol.model.ProtocolModel model=null;
+
+ CDMProtocolParser parser=new CDMProtocolParser();
+
+ try {
+ model = parser.parse(is, journal, null);
+ } catch(Exception e) {
+ result.addError(this, new Throwable("Parsing choreography failed"));
+ }
+
+ if (model == null) {
+ result.addError(this, new Throwable("Model is null"));
+ } else {
+
+ org.scribble.protocol.export.text.TextProtocolExporter exporter=
+ new org.scribble.protocol.export.text.TextProtocolExporter();
+
+ java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream();
+
+ exporter.export(model, journal, os);
+
+ try {
+ os.close();
+ } catch(Exception e) {
+ fail("Failed to close stream");
+ }
+
+ String str=os.toString();
+
+ checkResults(result, str);
+ }
+ }
+
+ result.endTest(this);
+ }
+
+ /**
+ * This method checks the generated protocol against a
+ * previously stored correct version.
+ *
+ * @param result The test result
+ * @param protocol The protocol
+ */
+ protected void checkResults(TestResult result, String protocol) {
+ boolean f_valid=false;
+
+ String filename="results/protocol/"+m_name+".spr";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is != null) {
+
+ try {
+ byte[] b=new byte[is.available()];
+
+ is.read(b);
+
+ is.close();
+
+ String orig=new String(b);
+
+ if (orig.equals(protocol) == false) {
+ result.addError(this,
+ new Throwable("Generated protocol does not match stored version"));
+ } else {
+ f_valid = true;
+ }
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ } else {
+ result.addError(this,
+ new Throwable("Resulting protocol '"+filename+
+ "' not found for comparison"));
+ }
+
+ if (f_valid == false) {
+ String bpelfile="testmodels/cdm/"+m_name+".cdm";
+
+ java.net.URL url=ClassLoader.getSystemResource(bpelfile);
+
+ if (url != null) {
+ // URL will point to copy of test models in the classes folder, so need
+ // to obtain reference back to source version
+ java.io.File f=null;
+
+ if (url.getFile().indexOf("target/test-classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
+ } else if (url.getFile().indexOf("classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
+ } else if (url.getFile().indexOf("bin") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
+ } else {
+ result.addError(this, new Exception("Could not locate results folder to record expected result"));
+ }
+
+ if (f != null && f.exists()) {
+ f = f.getParentFile().getParentFile().getParentFile();
+
+ java.io.File resultsDir=new java.io.File(f, "results/protocol");
+
+ if (resultsDir.exists() == false) {
+ resultsDir.mkdirs();
+ }
+
+ java.io.File resultFile=new java.io.File(resultsDir,
+ m_name+".generated");
+
+ if (resultFile.exists() == false) {
+ try {
+ java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
+
+ fos.write(protocol.getBytes());
+
+ fos.flush();
+ fos.close();
+
+ } catch(Exception e){
+ result.addError(this, e);
+ }
+ } else {
+ System.err.println("NOTE: Generated output '"+resultFile+
+ "' already exists - not being overwritten");
+ }
+ } else {
+ result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+
+ m_name+"': "+url));
+ }
+ }
+ }
+ }
+ }
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,214 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.pi4soa.cdm.parser;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.scribble.common.logging.CachedJournal;
-import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
-import org.savara.protocol.util.ProtocolServices;
-
-public class ParserTest {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Choreography->Protocol Parser Tests");
-
- suite.addTest(new ChoreographyToProtocolTester("ESBBroker"));
- suite.addTest(new ChoreographyToProtocolTester("PolicyQuote"));
- suite.addTest(new ChoreographyToProtocolTester("PurchaseGoods"));
- suite.addTest(new ChoreographyToProtocolTester("ReqRespFault"));
-
- return suite;
- }
-
- protected static class ChoreographyToProtocolTester extends TestCase {
-
- private String m_name=null;
-
- /**
- * This constructor is initialized with the test
- * name.
- *
- * @param name The test name
- */
- public ChoreographyToProtocolTester(String name) {
- super(name);
- m_name = name;
- }
-
- /**
- * This method runs the test.
- *
- * @param result The test result
- */
- public void run(TestResult result) {
- // Setup scribble services
- //ProtocolServices.setProtocolProjector(
- // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
-
- // Run test
- result.startTest(this);
-
- String filename="testmodels/cdm/"+m_name+".cdm";
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is == null) {
- result.addError(this,
- new Throwable("Unable to locate resource: "+filename));
- } else {
- CachedJournal journal=new CachedJournal();
-
- org.scribble.protocol.model.ProtocolModel model=null;
-
- CDMProtocolParser parser=new CDMProtocolParser();
-
- try {
- model = parser.parse(is, journal, null);
- } catch(Exception e) {
- result.addError(this, new Throwable("Parsing choreography failed"));
- }
-
- if (model == null) {
- result.addError(this, new Throwable("Model is null"));
- } else {
-
- org.scribble.protocol.export.text.TextProtocolExporter exporter=
- new org.scribble.protocol.export.text.TextProtocolExporter();
-
- java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream();
-
- exporter.export(model, journal, os);
-
- try {
- os.close();
- } catch(Exception e) {
- fail("Failed to close stream");
- }
-
- String str=os.toString();
-
- checkResults(result, str);
- }
- }
-
- result.endTest(this);
- }
-
- /**
- * This method checks the generated protocol against a
- * previously stored correct version.
- *
- * @param result The test result
- * @param protocol The protocol
- */
- protected void checkResults(TestResult result, String protocol) {
- boolean f_valid=false;
-
- String filename="results/protocol/"+m_name+".spr";
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is != null) {
-
- try {
- byte[] b=new byte[is.available()];
-
- is.read(b);
-
- is.close();
-
- String orig=new String(b);
-
- if (orig.equals(protocol) == false) {
- result.addError(this,
- new Throwable("Generated protocol does not match stored version"));
- } else {
- f_valid = true;
- }
- } catch(Exception e) {
- result.addError(this, e);
- }
- } else {
- result.addError(this,
- new Throwable("Resulting protocol '"+filename+
- "' not found for comparison"));
- }
-
- if (f_valid == false) {
- String bpelfile="testmodels/cdm/"+m_name+".cdm";
-
- java.net.URL url=ClassLoader.getSystemResource(bpelfile);
-
- if (url != null) {
- // URL will point to copy of test models in the classes folder, so need
- // to obtain reference back to source version
- java.io.File f=null;
-
- if (url.getFile().indexOf("target/test-classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
- } else if (url.getFile().indexOf("classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
- } else if (url.getFile().indexOf("bin") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
- } else {
- result.addError(this, new Exception("Could not locate results folder to record expected result"));
- }
-
- if (f != null && f.exists()) {
- f = f.getParentFile().getParentFile().getParentFile();
-
- java.io.File resultsDir=new java.io.File(f, "results/protocol");
-
- if (resultsDir.exists() == false) {
- resultsDir.mkdirs();
- }
-
- java.io.File resultFile=new java.io.File(resultsDir,
- m_name+".generated");
-
- if (resultFile.exists() == false) {
- try {
- java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
-
- fos.write(protocol.getBytes());
-
- fos.flush();
- fos.close();
-
- } catch(Exception e){
- result.addError(this, e);
- }
- } else {
- System.err.println("NOTE: Generated output '"+resultFile+
- "' already exists - not being overwritten");
- }
- } else {
- result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+
- m_name+"': "+url));
- }
- }
- }
- }
- }
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -20,9 +20,6 @@
import static org.junit.Assert.*;
import org.pi4soa.cdl.CDLManager;
-import org.savara.protocol.util.ProtocolServices;
-import org.scribble.common.logging.Journal;
-import org.scribble.protocol.model.ProtocolModel;
import org.scribble.protocol.model.Role;
public class ConverterUtilTest {
@@ -32,7 +29,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
@@ -71,7 +68,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
@@ -105,7 +102,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
@@ -139,7 +136,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
@@ -161,7 +158,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
@@ -195,7 +192,7 @@
org.pi4soa.cdl.Package cdlpack=null;
try {
- cdlpack = CDLManager.load("cdm/ESBBroker.cdm");
+ cdlpack = CDLManager.load("testmodels/cdm/ESBBroker.cdm");
} catch(Exception e) {
e.printStackTrace();
fail("Failed to load choreography: "+e);
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ESBBroker.spr 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,3 +1,4 @@
+[[ XSDElement ]]
import xsd "bookingReference" as BookingReference, "buy" as Buy, "cancel" as Cancel, "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid, "enquiry" as Enquiry, "orderConfirmed" as OrderConfirmed, "orderRejected" as OrderRejected, "quote" as Quote, "quoteList" as QuoteList, "requestForQuote" as RequestForQuote;
[[ SourceComponent(id=//(a)choreographies.0) ]]
[[ Namespace(name=http://www.pi4soa.org/ESBBroker/Broker,role=Broker) ]]
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,7 +1,13 @@
+[[ XSDElement ]]
import xsd "{http://creditagency.com/creditCheck}creditCheckRequest" as CreditCheckRequest, "{http://creditagency.com/creditCheck}creditCheckResponse" as CreditCheckResponse from "http://creditagency.com/creditCheck";
+[[ XSDElement ]]
import xsd "{http://dmv.com/drivingRecord}drivingRecordRequest" as DrivingRecordRequest, "{http://dmv.com/drivingRecord}drivingRecordResponse" as DrivingRecordResponse from "http://dmv.com/drivingRecord";
-import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+[[ XSDType ]]
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType from "http://www.w3.org/2001/XMLSchema";
+[[ XSDElement ]]
import xsd "{http://www.example.org/policyQuote}policyQuote" as PolicyQuote, "{http://www.example.org/policyQuote}policyQuoteFault" as PolicyQuoteFault, "{http://www.example.org/policyQuote}policyQuoteReply" as PolicyQuoteReply from "http://www.example.org/policyQuote";
+[[ XSDElement ]]
+import xsd "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
[[ SourceComponent(id=//(a)choreographies.0) ]]
[[ Namespace(name=http://www.pi4soa.org/PolicyQuote,role=Driver) ]]
[[ Namespace(name=http://creditagency.com/creditCheckService,role=CreditChec... ]]
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PurchaseGoods.spr 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,5 +1,8 @@
+[[ XSDType ]]
import xsd "{http://www.jboss.org/examples/store}BuyConfirmed" as BuyConfirmed, "{http://www.jboss.org/examples/store}BuyFailed" as BuyFailed, "{http://www.jboss.org/examples/store}BuyRequest" as BuyRequest from "http://www.jboss.org/examples/store";
+[[ XSDType ]]
import xsd "{java:org.jboss.savara.examples.purchasing}CreditCheckInvalid" as CreditCheckInvalid, "{java:org.jboss.savara.examples.purchasing}CreditCheckOk" as CreditCheckOk, "{java:org.jboss.savara.examples.purchasing}CreditCheckRequest" as CreditCheckRequest from "java:org.jboss.savara.examples.purchasing";
+[[ XSDType ]]
import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
[[ SourceComponent(id=//(a)choreographies.0) ]]
[[ Namespace(name=http://www.jboss.org/savara/examples,role=Buyer) ]]
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/ReqRespFault.spr 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,3 +1,4 @@
+[[ XSDElement ]]
import xsd "CreditCheckRequest" as CreditInformation, "CreditCheckInvalid" as CreditInvalid, "CreditCheckOk" as CreditValid;
[[ SourceComponent(id=//(a)choreographies.0) ]]
[[ Namespace(name=http://www.pi4soa.org/ReqRespFault/Buyer,role=Buyer) ]]
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -511,6 +511,14 @@
td.setDataType(ti.getDataType().getDetails());
if (til != null) {
+
+ // Associate annotations from type import list with type definition
+ for (org.scribble.common.model.Annotation ann : til.getAnnotations()) {
+ if (ann instanceof org.savara.common.model.annotation.Annotation) {
+ td.getAnnotations().add((org.savara.common.model.annotation.Annotation)ann);
+ }
+ }
+
td.setTypeSystem(til.getFormat());
if (til.getFormat() != null && TypeSystem.XSD.equals(til.getFormat()) &&
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)Broker.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)Broker.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)Broker.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,9 +1,15 @@
Contract {http://www.pi4soa.org/ESBBroker/Broker}Broker {
+ [[ XSDElement ]]
TypeDef BookingReference type=bookingReference location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef Buy type=buy location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef Cancel type=cancel location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef Enquiry type=enquiry location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef OrderRejected type=orderRejected location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef QuoteList type=quoteList location=null typeSystem=xsd
Interface {http://www.pi4soa.org/ESBBroker/Broker}Broker {
RequestResponseMEP makeEnquiry( Enquiry ) : QuoteList
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)CreditAgency.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)CreditAgency.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)CreditAgency.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,6 +1,9 @@
Contract {http://www.pi4soa.org/ESBBroker/CreditAgency}CreditAgency {
+ [[ XSDElement ]]
TypeDef CreditInformation type=CreditCheckRequest location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef CreditInvalid type=CreditCheckInvalid location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef CreditValid type=CreditCheckOk location=null typeSystem=xsd
Interface {http://www.pi4soa.org/ESBBroker/CreditAgency}CreditAgency {
RequestResponseMEP checkCredit( CreditInformation ) : CreditValid Fault invalidCredit( CreditInvalid )
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierQuoteEngine.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierQuoteEngine.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierQuoteEngine.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,5 +1,7 @@
Contract {http://www.pi4soa.org/ESBBroker/Supplier}SupplierQuoteEngine {
+ [[ XSDElement ]]
TypeDef Quote type=quote location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef RequestForQuote type=requestForQuote location=null typeSystem=xsd
Interface {http://www.pi4soa.org/ESBBroker/Supplier}SupplierQuoteEngine {
RequestResponseMEP getQuote( RequestForQuote ) : Quote
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierTxnProcessor.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierTxnProcessor.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ESBBroker(a)SupplierTxnProcessor.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,5 +1,7 @@
Contract {http://www.pi4soa.org/ESBBroker/Supplier}SupplierTxnProcessor {
+ [[ XSDElement ]]
TypeDef BookingReference type=bookingReference location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef OrderConfirmed type=orderConfirmed location=null typeSystem=xsd
Interface {http://www.pi4soa.org/ESBBroker/Supplier}SupplierTxnProcessor {
RequestResponseMEP confirm( OrderConfirmed ) : BookingReference
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,6 +1,8 @@
Contract {http://creditagency.com/creditCheckService}CreditCheckService {
Namespace prefix=cred uri=http://creditagency.com/creditCheck schemaLocation=schema/creditCheck.xsd
+ [[ XSDElement ]]
TypeDef CreditCheckRequest type={http://creditagency.com/creditCheck}creditCheckRequest location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef CreditCheckResponse type={http://creditagency.com/creditCheck}creditCheckResponse location=null typeSystem=xsd
Interface {http://creditagency.com/creditCheckService}CreditCheckService {
OneWayRequestMEP label0( )
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,9 +1,13 @@
Contract {http://www.example.org/policyQuoteProcessService}PolicyQuoteProcessService {
Namespace prefix=drv uri=http://dmv.com/drivingRecord schemaLocation=schema/drivingRecord.xsd
Namespace prefix=pol uri=http://www.example.org/policyQuote schemaLocation=schema/policyQuote.xsd
+ [[ XSDElement ]]
TypeDef DrivingRecordResponse type={http://dmv.com/drivingRecord}drivingRecordResponse location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef PolicyQuote type={http://www.example.org/policyQuote}policyQuote location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef PolicyQuoteFault type={http://www.example.org/policyQuote}policyQuoteFault location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef PolicyQuoteReply type={http://www.example.org/policyQuote}policyQuoteReply location=null typeSystem=xsd
Interface {http://www.example.org/policyQuoteProcessService}PolicyQuoteProcessService {
RequestResponseMEP receivePolicyQuote( PolicyQuote ) : PolicyQuoteReply Fault policyQuoteFault( PolicyQuoteFault )
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,7 +1,10 @@
Contract {java:org.jboss.savara.examples.purchasing}CreditAgency {
Namespace prefix=pur uri=java:org.jboss.savara.examples.purchasing schemaLocation=null
+ [[ XSDType ]]
TypeDef CreditCheckInvalid type={java:org.jboss.savara.examples.purchasing}CreditCheckInvalid location=null typeSystem=xsd
+ [[ XSDType ]]
TypeDef CreditCheckOk type={java:org.jboss.savara.examples.purchasing}CreditCheckOk location=null typeSystem=xsd
+ [[ XSDType ]]
TypeDef CreditCheckRequest type={java:org.jboss.savara.examples.purchasing}CreditCheckRequest location=null typeSystem=xsd
Interface {java:org.jboss.savara.examples.purchasing}CreditAgency {
RequestResponseMEP checkCredit( CreditCheckRequest ) : CreditCheckOk Fault CreditCheckFailed( CreditCheckInvalid )
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,7 +1,10 @@
Contract {http://www.jboss.org/examples/store}Store {
Namespace prefix=sto uri=http://www.jboss.org/examples/store schemaLocation=null
+ [[ XSDType ]]
TypeDef BuyConfirmed type={http://www.jboss.org/examples/store}BuyConfirmed location=null typeSystem=xsd
+ [[ XSDType ]]
TypeDef BuyFailed type={http://www.jboss.org/examples/store}BuyFailed location=null typeSystem=xsd
+ [[ XSDType ]]
TypeDef BuyRequest type={http://www.jboss.org/examples/store}BuyRequest location=null typeSystem=xsd
Interface {http://www.jboss.org/examples/store}Store {
RequestResponseMEP buy( BuyRequest ) : BuyConfirmed Fault BuyFailed( BuyFailed )
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ReqRespFault(a)Seller.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ReqRespFault(a)Seller.contract 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/ReqRespFault(a)Seller.contract 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,6 +1,9 @@
Contract {http://www.pi4soa.org/ReqRespFault/Seller}Seller {
+ [[ XSDElement ]]
TypeDef CreditInformation type=CreditCheckRequest location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef CreditInvalid type=CreditCheckInvalid location=null typeSystem=xsd
+ [[ XSDElement ]]
TypeDef CreditValid type=CreditCheckOk location=null typeSystem=xsd
Interface {http://www.pi4soa.org/ReqRespFault/Seller}Seller {
RequestResponseMEP checkCredit( CreditInformation ) : CreditValid Fault insufficientCredit( CreditInvalid )
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 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -22,9 +22,7 @@
import org.apache.commons.logging.Log;
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;
@@ -528,7 +526,8 @@
Part part=defn.createPart();
part.setName("content");
- if (td.getProperties().containsKey(AnnotationDefinitions.XSD_ELEMENT)) {
+ if (AnnotationDefinitions.getAnnotation(td.getAnnotations(),
+ AnnotationDefinitions.XSD_ELEMENT) != null) {
part.setElementName(qname);
} else {
part.setTypeName(qname);
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java 2011-02-10 20:00:20 UTC (rev 648)
@@ -52,7 +52,7 @@
suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Buyer"));
suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Seller"));
-
+
return suite;
}
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_Broker_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Broker" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="rejectedFault">
- <wsdl:part name="content" type="orderRejected">
+ <wsdl:part name="content" element="orderRejected">
</wsdl:part>
</wsdl:message>
<wsdl:message name="makeEnquiryRequest">
- <wsdl:part name="content" type="enquiry">
+ <wsdl:part name="content" element="enquiry">
</wsdl:part>
</wsdl:message>
<wsdl:message name="buyResponse">
- <wsdl:part name="content" type="bookingReference">
+ <wsdl:part name="content" element="bookingReference">
</wsdl:part>
</wsdl:message>
<wsdl:message name="makeEnquiryResponse">
- <wsdl:part name="content" type="quoteList">
+ <wsdl:part name="content" element="quoteList">
</wsdl:part>
</wsdl:message>
<wsdl:message name="buyRequest">
- <wsdl:part name="content" type="buy">
+ <wsdl:part name="content" element="buy">
</wsdl:part>
</wsdl:message>
<wsdl:message name="cancelRequest">
- <wsdl:part name="content" type="cancel">
+ <wsdl:part name="content" element="cancel">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Broker">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_CreditAgency_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="checkCreditResponse">
- <wsdl:part name="content" type="CreditCheckOk">
+ <wsdl:part name="content" element="CreditCheckOk">
</wsdl:part>
</wsdl:message>
<wsdl:message name="checkCreditRequest">
- <wsdl:part name="content" type="CreditCheckRequest">
+ <wsdl:part name="content" element="CreditCheckRequest">
</wsdl:part>
</wsdl:message>
<wsdl:message name="invalidCreditFault">
- <wsdl:part name="content" type="CreditCheckInvalid">
+ <wsdl:part name="content" element="CreditCheckInvalid">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="CreditAgency">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierQuoteEngine_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="getQuoteResponse">
- <wsdl:part name="content" type="quote">
+ <wsdl:part name="content" element="quote">
</wsdl:part>
</wsdl:message>
<wsdl:message name="getQuoteRequest">
- <wsdl:part name="content" type="requestForQuote">
+ <wsdl:part name="content" element="requestForQuote">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="SupplierQuoteEngine">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ESBBroker_SupplierTxnProcessor_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="confirmRequest">
- <wsdl:part name="content" type="orderConfirmed">
+ <wsdl:part name="content" element="orderConfirmed">
</wsdl:part>
</wsdl:message>
<wsdl:message name="confirmResponse">
- <wsdl:part name="content" type="bookingReference">
+ <wsdl:part name="content" element="bookingReference">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="SupplierTxnProcessor">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="CreditCheckService" targetNamespace="http://creditagency.com/creditCheckService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://creditagency.com/creditCheckService" xmlns:cred="http://creditagency.com/creditCheck" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="checkCreditRequest">
- <wsdl:part name="content" type="cred:creditCheckRequest">
+ <wsdl:part name="content" element="cred:creditCheckRequest">
</wsdl:part>
</wsdl:message>
<wsdl:message name="checkCreditResponse">
- <wsdl:part name="content" type="cred:creditCheckResponse">
+ <wsdl:part name="content" element="cred:creditCheckResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="CreditCheckService">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="PolicyQuoteProcessService" targetNamespace="http://www.example.org/policyQuoteProcessService" xmlns:drv="http://dmv.com/drivingRecord" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.org/policyQuoteProcessService" xmlns:pol="http://www.example.org/policyQuote" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="policyQuoteFaultFault">
- <wsdl:part name="content" type="pol:policyQuoteFault">
+ <wsdl:part name="content" element="pol:policyQuoteFault">
</wsdl:part>
</wsdl:message>
<wsdl:message name="receivePolicyQuoteResponse">
- <wsdl:part name="content" type="pol:policyQuoteReply">
+ <wsdl:part name="content" element="pol:policyQuoteReply">
</wsdl:part>
</wsdl:message>
<wsdl:message name="receivePolicyQuoteRequest">
- <wsdl:part name="content" type="pol:policyQuote">
+ <wsdl:part name="content" element="pol:policyQuote">
</wsdl:part>
</wsdl:message>
<wsdl:message name="receiveDrivingRecordRequest">
- <wsdl:part name="content" type="drv:drivingRecordResponse">
+ <wsdl:part name="content" element="drv:drivingRecordResponse">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="PolicyQuoteProcessService">
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl 2011-02-10 18:11:03 UTC (rev 647)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/ReqRespFault_Seller_rpc_0.wsdl 2011-02-10 20:00:20 UTC (rev 648)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="checkCreditRequest">
- <wsdl:part name="content" type="CreditCheckRequest">
+ <wsdl:part name="content" element="CreditCheckRequest">
</wsdl:part>
</wsdl:message>
<wsdl:message name="checkCreditResponse">
- <wsdl:part name="content" type="CreditCheckOk">
+ <wsdl:part name="content" element="CreditCheckOk">
</wsdl:part>
</wsdl:message>
<wsdl:message name="insufficientCreditFault">
- <wsdl:part name="content" type="CreditCheckInvalid">
+ <wsdl:part name="content" element="CreditCheckInvalid">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="Seller">
15 years, 2 months
- 1
- 0
savara SVN: r647 - in branches/experimental/2.0.x/bundles: org.savara.bpel/src/main/java/org/savara/bpel/model/change and 8 other directories.
by do-not-reply＠jboss.org
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">
<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);
}
}
15 years, 2 months
- 1
- 0
savara SVN: r646 - in branches/experimental/2.0.x/bundles/org.savara.bpel/src: test/java/org/savara/bpel/generator and 2 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-10 07:32:24 -0500 (Thu, 10 Feb 2011)
New Revision: 646
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/bpel/SerializeTest.bpel
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/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
Log:
SAVARA-175 - replaced sun internal jaxb namespace prefix mapping mechanism, that changed across jdk versions, with a more standard (but not ideal) workaround.
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-09 23:15:27 UTC (rev 645)
+++ 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)
@@ -63,17 +63,34 @@
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
if (prefixes != null) {
- try {
- com.sun.xml.bind.marshaller.NamespacePrefixMapper mapper=
- new NamespacePrefixMapperImpl(prefixes);
+ java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
+
+ marshaller.marshal(factory.createProcess(desc), baos);
+
+ // Convert to DOM
+ javax.xml.parsers.DocumentBuilderFactory dbfactory=
+ javax.xml.parsers.DocumentBuilderFactory.newInstance();
+ dbfactory.setNamespaceAware(true);
+
+ org.w3c.dom.Document doc=
+ dbfactory.newDocumentBuilder().parse(new java.io.ByteArrayInputStream(baos.toByteArray()));
+
+ for (String ns : prefixes.keySet()) {
+ String prefix=prefixes.get(ns);
- marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", mapper);
- } catch (RuntimeException mex) {
- mex.printStackTrace();
- }
+ doc.getDocumentElement().setAttribute("xmlns:"+prefix, ns);
+ }
+
+ 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);
}
-
- marshaller.marshal(factory.createProcess(desc), os);
} catch(Exception e) {
throw new IOException("Failed to serialize model", e);
}
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-09 23:15:27 UTC (rev 645)
+++ 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)
@@ -29,9 +29,7 @@
import org.savara.common.model.annotation.AnnotationDefinitions;
import org.savara.common.model.generator.ModelGenerator;
import org.scribble.common.logging.CachedJournal;
-import org.scribble.protocol.model.Role;
import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
-import org.savara.protocol.util.ProtocolServices;
public class GeneratorTest {
@@ -169,69 +167,60 @@
projected.getProtocol().getAnnotations(), AnnotationDefinitions.TYPE);
}
- java.util.List<Role> projectedRoles=projected.getRoles();
+ //java.util.List<Role> projectedRoles=projected.getRoles();
ModelGenerator generator=new ProtocolToBPELModelGenerator();
- //defn = projected.getProtocol();
-
- if (generator != null) { // && defn != null) {
-
- Object target=generator.generate(projected, journal, null);
-
- /*
- ModelReference targetRef=
- new ModelReference(BPELNotation.NOTATION_CODE);
- targetRef.setAlias(m_name);
- targetRef.setLocatedRole(m_role);
-
- DefaultBPELLanguageModel target=
- new DefaultBPELLanguageModel(targetRef);
+ Object target=generator.generate(projected, journal, 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 instanceof TProcess) {
- // Obtain any namespace prefix map
- java.util.Map<String, String> prefixes=
- new java.util.HashMap<String, String>();
-
- java.util.List<Annotation> list=
- AnnotationDefinitions.getAnnotations(projected.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));
- }
- }
-
- try {
- java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
-
- BPELModelUtil.serialize((TProcess)target, baos, prefixes);
-
- baos.close();
-
- String text=new String(baos.toByteArray());
-
- 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("Unable to find Model Generator"));
- }
- }
+ generator.generate(targetRef, role,
+ target, projected);
+ */
+
+ if (target instanceof TProcess) {
+ // Obtain any namespace prefix map
+ java.util.Map<String, String> prefixes=
+ new java.util.HashMap<String, String>();
+
+ java.util.List<Annotation> list=
+ AnnotationDefinitions.getAnnotations(projected.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));
+ }
+ }
+
+ try {
+ java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
+
+ BPELModelUtil.serialize((TProcess)target, baos, prefixes);
+
+ baos.close();
+
+ String text=new String(baos.toByteArray());
+
+ checkResults(result, text);
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ } else {
+ result.addError(this,
+ new Throwable("No BPEL generated"));
+ }
+ }
}
}
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-09 23:15:27 UTC (rev 645)
+++ 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)
@@ -23,7 +23,7 @@
public class BPELModelUtilTest extends TestCase {
- public void testGetBPELModel() {
+ public void testDeserialize() {
String filename="bpel/PolicyQuoteProcess_PolicyQuoteProcessService.bpel";
java.io.InputStream is=
@@ -43,4 +43,63 @@
fail("Failed to deserialise BPEL process: "+e);
}
}
+
+ public void testSerialize() {
+ String filename="bpel/SerializeTest.bpel";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is == null) {
+ fail("Failed to load BPEL model file '"+filename+"'");
+ }
+
+ try {
+ TProcess process=BPELModelUtil.deserialize(is);
+
+ if (process == null) {
+ fail("Failed to retrieve BPEL process");
+ }
+
+ java.io.ByteArrayOutputStream os=new java.io.ByteArrayOutputStream();
+
+ java.util.Map<String,String> prefixes=new java.util.HashMap<String, String>();
+
+ //prefixes.put("http://docs.oasis-open.org/wsbpel/2.0/process/executable","bpel");
+ prefixes.put("http://creditagency.com/creditCheckService","ca");
+ prefixes.put("http://creditagency.com/creditCheck","cred");
+ prefixes.put("http://dmv.com/drivingRecordService","dmv");
+ prefixes.put("http://dmv.com/drivingRecord","drv");
+ prefixes.put("http://www.example.org/policyQuoteCalculationService","pcs");
+ prefixes.put("http://www.example.org/policyQuoteEntityService","pes");
+ prefixes.put("http://www.example.org/policyQuote","pol");
+ prefixes.put("http://www.example.org/policyQuoteProcessService","pps");
+ prefixes.put("http://www.pi4soa.org/PolicyQuote","tns");
+ prefixes.put("http://www.w3.org/2001/XMLSchema","xsd");
+ prefixes.put("http://www.scribble.org/conversation","ns0");
+
+ BPELModelUtil.serialize(process, os, prefixes);
+
+ String serialized=new String(os.toByteArray());
+
+ os.close();
+
+ is = ClassLoader.getSystemResourceAsStream(filename);
+
+ byte[] b=new byte[is.available()];
+ is.read(b);
+
+ String original=new String(b);
+
+ if (serialized.equals(original) == false) {
+ System.out.println("BPEL serialize: original (len="+original.length()+
+ ") ::"+original+":: serialized (len="+serialized.length()+") ::"+serialized+"::");
+
+ fail("Serialized BPEL not same as original");
+ }
+
+ } catch(Exception e) {
+ fail("Failed to deserialise BPEL process: "+e);
+ }
+ }
}
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/bpel/SerializeTest.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/bpel/SerializeTest.bpel (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/bpel/SerializeTest.bpel 2011-02-10 12:32:24 UTC (rev 646)
@@ -0,0 +1,43 @@
+<?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:ns0="http://www.scribble.org/conversation" 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" ns0:conversationType="org.pi4soa.policyquote.policyquote.PolicyQuoteProcess@PolicyQuoteProcessService" targetNamespace="http://www.example.org/policyQuoteProcessService">
+ <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_CreditCheckService.wsdl" namespace="http://creditagency.com/creditCheckService"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_DrivingRecordService.wsdl" namespace="http://dmv.com/drivingRecordService"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_PolicyQuoteCalculationService.wsdl" namespace="http://www.example.org/policyQuoteCalculationService"/>
+ <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" name="DriverToPolicyQuoteProcessService" partnerLinkType="pps:DriverToPolicyQuoteProcessServiceServiceLT"/>
+ <partnerLink name="PolicyQuoteProcessServiceToDrivingRecordService" partnerLinkType="pps:PolicyQuoteProcessServiceToDrivingRecordServiceLT" partnerRole="DrivingRecordServiceRequester"/>
+ <partnerLink myRole="DrivingRecordCallbackService" 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="policyQuoteVar"/>
+ <variable messageType="dmv:checkDrivingRecordRequest" name="drivingRecordRequestVar"/>
+ <variable messageType="pps:receiveDrivingRecordRequest" name="drivingRecordResponseVar"/>
+ <variable messageType="ca:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="ca:checkCreditResponse" name="creditCheckResponseVar"/>
+ <variable messageType="pcs:calculatePolicyQuoteResponse" name="policyQuoteReplyVar"/>
+ <variable messageType="pps:policyQuoteFaultFault" name="policyQuoteFaultVar"/>
+ </variables>
+ <sequence>
+ <receive createInstance="yes" name="Receive_policyQuote" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="policyQuoteVar"/>
+ <invoke inputVariable="drivingRecordRequestVar" name="Send_drivingRecordRequest" operation="checkDrivingRecord" partnerLink="PolicyQuoteProcessServiceToDrivingRecordService" portType="dmv:DrivingRecordService"/>
+ <receive name="Receive_drivingRecordResponse" operation="receiveDrivingRecord" partnerLink="DrivingRecordServiceToPolicyQuoteProcessService" portType="pps:DrivingRecordCallbackService" variable="drivingRecordResponseVar"/>
+ <if>
+ <sequence>
+ <invoke inputVariable="creditCheckRequestVar" name="Send_creditCheckRequest" operation="checkCredit" outputVariable="creditCheckResponseVar" partnerLink="PolicyQuoteProcessServiceToCreditCheckService" portType="ca:CreditCheckService"/>
+ <invoke inputVariable="policyQuoteVar" name="Send_policyQuote" operation="calculatePolicyQuote" outputVariable="policyQuoteReplyVar" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteCalculationService" portType="pcs:PolicyQuoteCalculationService"/>
+ <invoke inputVariable="policyQuoteVar" name="Send_policyQuote" operation="createPolicyQuote" outputVariable="policyQuoteReplyVar" partnerLink="PolicyQuoteProcessServiceToPolicyQuoteEntityService" portType="pes:PolicyQuoteEntityService"/>
+ <reply name="Send_policyQuoteReply" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="policyQuoteReplyVar"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply faultName="pps:policyQuoteFault" name="Send_policyQuoteFault" operation="receivePolicyQuote" partnerLink="DriverToPolicyQuoteProcessService" portType="pps:PolicyQuoteProcessService" variable="policyQuoteFaultVar"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
\ No newline at end of file
15 years, 2 months
- 1
- 0
savara SVN: r645 - in branches/experimental/2.0.x: bundles/org.savara.bpel/src/main/java/org/savara/bpel/util and 10 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-09 18:15:27 -0500 (Wed, 09 Feb 2011)
New Revision: 645
Added:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/ProtocolToContractGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/testmodels/protocol/PolicyQuote.spr
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PolicyQuote.spr
Removed:
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties
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.contract/src/main/java/org/savara/contract/model/Contract.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract
branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract
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/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
Log:
Fixed some bpel and wsdl generation issues, such as ensuring the namespace is provided. Added further testcases based on the policy quote choreography.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/build.properties 2011-02-09 23:15:27 UTC (rev 645)
@@ -2,5 +2,4 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/jaxb-api.jar,\
- lib/jaxb-impl.jar
+ lib/
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-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -62,14 +62,13 @@
Marshaller marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
- com.sun.xml.bind.marshaller.NamespacePrefixMapper mapper=null;
-
if (prefixes != null) {
- mapper = new NamespacePrefixMapperImpl(prefixes);
-
try {
+ com.sun.xml.bind.marshaller.NamespacePrefixMapper mapper=
+ new NamespacePrefixMapperImpl(prefixes);
+
marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", mapper);
- } catch (Exception mex) {
+ } catch (RuntimeException mex) {
mex.printStackTrace();
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -154,11 +154,45 @@
return(m_namespaces);
}
+ /**
+ * This method returns the namespace associated with
+ * the specified URI.
+ *
+ * @param uri The URI
+ * @return The namespace or null if not found
+ */
+ public Namespace getNamespaceForURI(String uri) {
+ Namespace ret=null;
+
+ for (Namespace ns : m_namespaces) {
+ if (ns.getURI() != null && ns.getURI().equals(uri)) {
+ ret = ns;
+ break;
+ }
+ }
+
+ return(ret);
+ }
+
public String toString() {
StringBuffer buf=new StringBuffer();
buf.append("Contract {"+m_namespace+"}"+m_name+" {\r\n");
+ // Sort namespaces, so output is consistent
+ java.util.List<Namespace> nslist=new Vector<Namespace>(getNamespaces());
+
+ Collections.sort(nslist, new Comparator<Namespace>() {
+
+ public int compare(Namespace arg0, Namespace arg1) {
+ return(arg0.getURI().compareTo(arg1.getURI()));
+ }
+ });
+
+ for (Namespace ns : nslist) {
+ buf.append(ns.toString());
+ }
+
// Sort type definitions, so output is consistent
java.util.List<TypeDefinition> tdlist=new Vector<TypeDefinition>(getTypeDefinitions());
@@ -173,7 +207,7 @@
buf.append(td.toString());
}
- // Sort type definitions, so output is consistent
+ // Sort interfaces, so output is consistent
java.util.List<Interface> intflist=new Vector<Interface>(getInterfaces());
Collections.sort(intflist, new Comparator<Interface>() {
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -88,4 +88,9 @@
public void setSchemaLocation(String schemaLocation) {
m_schemaLocation = schemaLocation;
}
+
+ public String toString() {
+ return("\tNamespace prefix="+m_prefix+
+ " uri="+m_uri+" schemaLocation="+m_schemaLocation+"\r\n");
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractGeneratorImpl.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractGeneratorImpl.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -22,9 +22,7 @@
import org.savara.contract.model.Contract;
import org.savara.protocol.contract.generator.ContractGenerator;
import org.scribble.common.logging.Journal;
-import org.scribble.protocol.ProtocolContext;
import org.scribble.protocol.model.Protocol;
-import org.scribble.protocol.model.ProtocolModel;
import org.scribble.protocol.model.Role;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/contract/generator/impl/ContractIntrospector.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -25,12 +25,14 @@
import java.util.logging.Logger;
import org.savara.protocol.model.util.InteractionUtil;
+import org.savara.protocol.model.util.TypeSystem;
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.FaultDetails;
import org.savara.contract.model.Interface;
import org.savara.contract.model.MessageExchangePattern;
+import org.savara.contract.model.Namespace;
import org.savara.contract.model.OneWayRequestMEP;
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
@@ -510,6 +512,31 @@
if (til != null) {
td.setTypeSystem(til.getFormat());
+
+ if (til.getFormat() != null && TypeSystem.XSD.equals(til.getFormat()) &&
+ til.getLocation() != null &&
+ getContract().getNamespaceForURI(til.getLocation()) == null) {
+
+ // Check if namespace has been defined for location
+ //tref.getModel().getProtocol().
+ java.util.List<Annotation> annotations=
+ AnnotationDefinitions.getAnnotations(tref.getModel().getProtocol().getAnnotations(),
+ AnnotationDefinitions.TYPE);
+
+ for (Annotation ann : annotations) {
+ String nstxt=(String)ann.getProperties().get(AnnotationDefinitions.NAMESPACE_PROPERTY);
+
+ if (nstxt != null && nstxt.equals(til.getLocation())) {
+ Namespace ns=new Namespace();
+ ns.setURI(til.getLocation());
+ ns.setPrefix((String)ann.getProperties().get(AnnotationDefinitions.PREFIX_PROPERTY));
+ ns.setSchemaLocation((String)ann.getProperties().get(AnnotationDefinitions.LOCATION_PROPERTY));
+ getContract().getNamespaces().add(ns);
+
+ break;
+ }
+ }
+ }
}
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,237 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.protocol.contract.generator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-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.scribble.common.logging.CachedJournal;
-import org.scribble.protocol.model.Role;
-import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
-import org.savara.protocol.contract.generator.ContractGenerator;
-import org.savara.protocol.contract.generator.ContractGeneratorFactory;
-import org.savara.protocol.util.ProtocolServices;
-
-public class GeneratorTest {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Protocol->Contract Generator Tests");
-
- suite.addTest(new ProtocolToContractTester("ESBBroker", "Broker"));
- suite.addTest(new ProtocolToContractTester("ESBBroker", "Buyer"));
- suite.addTest(new ProtocolToContractTester("ESBBroker", "SupplierTxnProcessor"));
- suite.addTest(new ProtocolToContractTester("ESBBroker", "CreditAgency"));
- suite.addTest(new ProtocolToContractTester("ESBBroker", "SupplierQuoteEngine"));
-
- suite.addTest(new ProtocolToContractTester("PurchaseGoods", "Buyer"));
- suite.addTest(new ProtocolToContractTester("PurchaseGoods", "CreditAgency"));
- suite.addTest(new ProtocolToContractTester("PurchaseGoods", "Store"));
-
- suite.addTest(new ProtocolToContractTester("ReqRespFault", "Buyer"));
- suite.addTest(new ProtocolToContractTester("ReqRespFault", "Seller"));
-
- return suite;
- }
-
- protected static class ProtocolToContractTester extends TestCase {
-
- /**
- * This constructor is initialized with the test
- * name.
- *
- * @param name The test name
- * @param role The role
- */
- public ProtocolToContractTester(String name,
- String role) {
- super(name+"@"+role);
- m_name = name;
- m_role = role;
- }
-
- /**
- * This method runs the test.
- *
- * @param result The test result
- */
- public void run(TestResult result) {
-
- // Run test
- result.startTest(this);
-
- String filename="testmodels/protocol/"+m_name+".spr";
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is == null) {
- result.addError(this,
- new Throwable("Unable to locate resource: "+filename));
- } else {
- CachedJournal journal=new CachedJournal();
-
- org.scribble.protocol.model.ProtocolModel model=null;
-
- ANTLRProtocolParser parser=new ANTLRProtocolParser();
- parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor());
-
- try {
- model = parser.parse(is, journal, null);
- } catch(Exception e) {
- result.addError(this, new Throwable("Parsing choreography failed"));
- }
-
- if (model == null) {
- result.addError(this, new Throwable("Model is null"));
- } else {
- ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
- if (cg != null) {
- Contract contract=cg.generate(model.getProtocol(), null, new Role(m_role), journal);
-
- if (contract != null) {
- checkResults(result, contract.toString());
- } else {
- result.addError(this, new Throwable("No contract"));
- }
- }
- }
- }
-
- result.endTest(this);
- }
-
- /**
- * This method checks the generated BPEL against a
- * previously stored correct version.
- *
- * @param result The test result
- * @param bpel The BPEL
- */
- protected void checkResults(TestResult result, String bpel) {
- boolean f_valid=false;
-
- String filename="results/contract/"+m_name+"@"+m_role+".contract";
-
- java.io.InputStream is=
- //ChoreographyToBPELTester.class.getResourceAsStream(filename);
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is != null) {
-
- try {
- byte[] b=new byte[is.available()];
-
- is.read(b);
-
- is.close();
-
- String orig=new String(b);
-
- if (orig.equals(bpel) == false) {
- result.addError(this,
- new Throwable("Generated Contract does not match stored version"));
- } else {
- f_valid = true;
- }
- } catch(Exception e) {
- result.addError(this, e);
- }
- } else {
- result.addError(this,
- new Throwable("Resulting Contract '"+filename+
- "' not found for comparison"));
- }
-
- if (f_valid == false) {
- String srcfile="testmodels/protocol/"+m_name+".spr";
-
- java.net.URL url=ClassLoader.getSystemResource(srcfile);
-
- /*
- try {
- url = org.eclipse.core.runtime.FileLocator.toFileURL(url);
- } catch(Exception e) {
- e.printStackTrace();
- }
- */
-
- if (url != null) {
- // URL will point to copy of test models in the classes folder, so need
- // to obtain reference back to source version
- java.io.File f=null;
-
- if (url.getFile().indexOf("target/test-classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
- } else if (url.getFile().indexOf("target/classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
- } else if (url.getFile().indexOf("classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
- } else if (url.getFile().indexOf("bin") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
- } else {
- result.addError(this, new Exception("Could not locate results folder to record expected result"));
- }
-
- if (f != null && f.exists()) {
- f = f.getParentFile().getParentFile().getParentFile();
-
- java.io.File resultsDir=new java.io.File(f, "results/contract");
-
- if (resultsDir.exists() == false) {
- resultsDir.mkdirs();
- }
-
- java.io.File resultFile=new java.io.File(resultsDir,
- m_name+"@"+m_role+".generated");
-
- //if (resultFile.exists() == false) {
- try {
- java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
-
- fos.write(bpel.getBytes());
-
- fos.flush();
- fos.close();
-
- } catch(Exception e){
- result.addError(this, e);
- }
- /*
- } else {
- System.err.println("NOTE: Generated output '"+resultFile+
- "' already exists - not being overwritten");
- }
- */
- } else {
- result.addError(this, new Throwable("Unable to obtain URL for model source '"+
- m_name+"': "+url));
- }
- }
- }
- }
-
- private String m_name=null;
- private String m_role=null;
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/ProtocolToContractGeneratorTest.java (from rev 639, branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/GeneratorTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/ProtocolToContractGeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/java/org/savara/protocol/contract/generator/ProtocolToContractGeneratorTest.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,236 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.protocol.contract.generator;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.savara.contract.model.Contract;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
+import org.savara.protocol.contract.generator.ContractGenerator;
+import org.savara.protocol.contract.generator.ContractGeneratorFactory;
+
+public class ProtocolToContractGeneratorTest {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Protocol->Contract Generator Tests");
+
+ suite.addTest(new ProtocolToContractTester("PolicyQuote", "CreditCheckService"));
+ suite.addTest(new ProtocolToContractTester("PolicyQuote", "PolicyQuoteProcessService"));
+
+ suite.addTest(new ProtocolToContractTester("ESBBroker", "Broker"));
+ suite.addTest(new ProtocolToContractTester("ESBBroker", "Buyer"));
+ suite.addTest(new ProtocolToContractTester("ESBBroker", "SupplierTxnProcessor"));
+ suite.addTest(new ProtocolToContractTester("ESBBroker", "CreditAgency"));
+ suite.addTest(new ProtocolToContractTester("ESBBroker", "SupplierQuoteEngine"));
+
+ suite.addTest(new ProtocolToContractTester("PurchaseGoods", "Buyer"));
+ suite.addTest(new ProtocolToContractTester("PurchaseGoods", "CreditAgency"));
+ suite.addTest(new ProtocolToContractTester("PurchaseGoods", "Store"));
+
+ suite.addTest(new ProtocolToContractTester("ReqRespFault", "Buyer"));
+ suite.addTest(new ProtocolToContractTester("ReqRespFault", "Seller"));
+
+ return suite;
+ }
+
+ protected static class ProtocolToContractTester extends TestCase {
+
+ /**
+ * This constructor is initialized with the test
+ * name.
+ *
+ * @param name The test name
+ * @param role The role
+ */
+ public ProtocolToContractTester(String name,
+ String role) {
+ super(name+"@"+role);
+ m_name = name;
+ m_role = role;
+ }
+
+ /**
+ * This method runs the test.
+ *
+ * @param result The test result
+ */
+ public void run(TestResult result) {
+
+ // Run test
+ result.startTest(this);
+
+ String filename="testmodels/protocol/"+m_name+".spr";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is == null) {
+ result.addError(this,
+ new Throwable("Unable to locate resource: "+filename));
+ } else {
+ CachedJournal journal=new CachedJournal();
+
+ org.scribble.protocol.model.ProtocolModel model=null;
+
+ ANTLRProtocolParser parser=new ANTLRProtocolParser();
+ parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor());
+
+ try {
+ model = parser.parse(is, journal, null);
+ } catch(Exception e) {
+ result.addError(this, new Throwable("Parsing choreography failed"));
+ }
+
+ if (model == null) {
+ result.addError(this, new Throwable("Model is null"));
+ } else {
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ if (cg != null) {
+ Contract contract=cg.generate(model.getProtocol(), null, new Role(m_role), journal);
+
+ if (contract != null) {
+ checkResults(result, contract.toString());
+ } else {
+ result.addError(this, new Throwable("No contract"));
+ }
+ }
+ }
+ }
+
+ result.endTest(this);
+ }
+
+ /**
+ * This method checks the generated BPEL against a
+ * previously stored correct version.
+ *
+ * @param result The test result
+ * @param bpel The BPEL
+ */
+ protected void checkResults(TestResult result, String bpel) {
+ boolean f_valid=false;
+
+ String filename="results/contract/"+m_name+"@"+m_role+".contract";
+
+ java.io.InputStream is=
+ //ChoreographyToBPELTester.class.getResourceAsStream(filename);
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is != null) {
+
+ try {
+ byte[] b=new byte[is.available()];
+
+ is.read(b);
+
+ is.close();
+
+ String orig=new String(b);
+
+ if (orig.equals(bpel) == false) {
+ result.addError(this,
+ new Throwable("Generated Contract does not match stored version"));
+ } else {
+ f_valid = true;
+ }
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ } else {
+ result.addError(this,
+ new Throwable("Resulting Contract '"+filename+
+ "' not found for comparison"));
+ }
+
+ if (f_valid == false) {
+ String srcfile="testmodels/protocol/"+m_name+".spr";
+
+ java.net.URL url=ClassLoader.getSystemResource(srcfile);
+
+ /*
+ try {
+ url = org.eclipse.core.runtime.FileLocator.toFileURL(url);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ */
+
+ if (url != null) {
+ // URL will point to copy of test models in the classes folder, so need
+ // to obtain reference back to source version
+ java.io.File f=null;
+
+ if (url.getFile().indexOf("target/test-classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
+ } else if (url.getFile().indexOf("target/classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
+ } else if (url.getFile().indexOf("classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
+ } else if (url.getFile().indexOf("bin") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
+ } else {
+ result.addError(this, new Exception("Could not locate results folder to record expected result"));
+ }
+
+ if (f != null && f.exists()) {
+ f = f.getParentFile().getParentFile().getParentFile();
+
+ java.io.File resultsDir=new java.io.File(f, "results/contract");
+
+ if (resultsDir.exists() == false) {
+ resultsDir.mkdirs();
+ }
+
+ java.io.File resultFile=new java.io.File(resultsDir,
+ m_name+"@"+m_role+".generated");
+
+ //if (resultFile.exists() == false) {
+ try {
+ java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
+
+ fos.write(bpel.getBytes());
+
+ fos.flush();
+ fos.close();
+
+ } catch(Exception e){
+ result.addError(this, e);
+ }
+ /*
+ } else {
+ System.err.println("NOTE: Generated output '"+resultFile+
+ "' already exists - not being overwritten");
+ }
+ */
+ } else {
+ result.addError(this, new Throwable("Unable to obtain URL for model source '"+
+ m_name+"': "+url));
+ }
+ }
+ }
+ }
+
+ private String m_name=null;
+ private String m_role=null;
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)CreditCheckService.contract 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,10 @@
+Contract {http://creditagency.com/creditCheckService}CreditCheckService {
+ Namespace prefix=cred uri=http://creditagency.com/creditCheck schemaLocation=schema/creditCheck.xsd
+ TypeDef CreditCheckRequest type={http://creditagency.com/creditCheck}creditCheckRequest location=null typeSystem=xsd
+ TypeDef CreditCheckResponse type={http://creditagency.com/creditCheck}creditCheckResponse location=null typeSystem=xsd
+ Interface {http://creditagency.com/creditCheckService}CreditCheckService {
+ OneWayRequestMEP label0( )
+ RequestResponseMEP checkCredit( CreditCheckRequest ) : CreditCheckResponse
+ OneWayRequestMEP label1( )
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PolicyQuote(a)PolicyQuoteProcessService.contract 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,14 @@
+Contract {http://www.example.org/policyQuoteProcessService}PolicyQuoteProcessService {
+ Namespace prefix=drv uri=http://dmv.com/drivingRecord schemaLocation=schema/drivingRecord.xsd
+ Namespace prefix=pol uri=http://www.example.org/policyQuote schemaLocation=schema/policyQuote.xsd
+ TypeDef DrivingRecordResponse type={http://dmv.com/drivingRecord}drivingRecordResponse location=null typeSystem=xsd
+ TypeDef PolicyQuote type={http://www.example.org/policyQuote}policyQuote location=null typeSystem=xsd
+ TypeDef PolicyQuoteFault type={http://www.example.org/policyQuote}policyQuoteFault location=null typeSystem=xsd
+ TypeDef PolicyQuoteReply type={http://www.example.org/policyQuote}policyQuoteReply location=null typeSystem=xsd
+ Interface {http://www.example.org/policyQuoteProcessService}PolicyQuoteProcessService {
+ RequestResponseMEP receivePolicyQuote( PolicyQuote ) : PolicyQuoteReply Fault policyQuoteFault( PolicyQuoteFault )
+ OneWayRequestMEP receiveDrivingRecord( DrivingRecordResponse )
+ OneWayRequestMEP label0( )
+ OneWayRequestMEP label1( )
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)CreditAgency.contract 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,4 +1,5 @@
Contract {java:org.jboss.savara.examples.purchasing}CreditAgency {
+ Namespace prefix=pur uri=java:org.jboss.savara.examples.purchasing schemaLocation=null
TypeDef CreditCheckInvalid type={java:org.jboss.savara.examples.purchasing}CreditCheckInvalid location=null typeSystem=xsd
TypeDef CreditCheckOk type={java:org.jboss.savara.examples.purchasing}CreditCheckOk location=null typeSystem=xsd
TypeDef CreditCheckRequest type={java:org.jboss.savara.examples.purchasing}CreditCheckRequest location=null typeSystem=xsd
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/results/contract/PurchaseGoods(a)Store.contract 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,4 +1,5 @@
Contract {http://www.jboss.org/examples/store}Store {
+ Namespace prefix=sto uri=http://www.jboss.org/examples/store schemaLocation=null
TypeDef BuyConfirmed type={http://www.jboss.org/examples/store}BuyConfirmed location=null typeSystem=xsd
TypeDef BuyFailed type={http://www.jboss.org/examples/store}BuyFailed location=null typeSystem=xsd
TypeDef BuyRequest type={http://www.jboss.org/examples/store}BuyRequest location=null typeSystem=xsd
Added: branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/testmodels/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/testmodels/protocol/PolicyQuote.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/test/resources/testmodels/protocol/PolicyQuote.spr 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,70 @@
+import xsd "{http://creditagency.com/creditCheck}creditCheckRequest" as CreditCheckRequest, "{http://creditagency.com/creditCheck}creditCheckResponse" as CreditCheckResponse from "http://creditagency.com/creditCheck";
+import xsd "{http://dmv.com/drivingRecord}drivingRecordRequest" as DrivingRecordRequest, "{http://dmv.com/drivingRecord}drivingRecordResponse" as DrivingRecordResponse from "http://dmv.com/drivingRecord";
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+import xsd "{http://www.example.org/policyQuote}policyQuote" as PolicyQuote, "{http://www.example.org/policyQuote}policyQuoteFault" as PolicyQuoteFault, "{http://www.example.org/policyQuote}policyQuoteReply" as PolicyQuoteReply from "http://www.example.org/policyQuote";
+[[ SourceComponent(id=//(a)choreographies.0) ]]
+[[ Namespace(name=http://www.pi4soa.org/PolicyQuote,role=Driver) ]]
+[[ Namespace(name=http://creditagency.com/creditCheckService,role=CreditChec... ]]
+[[ Namespace(name=http://dmv.com/drivingRecordService,role=DrivingRecordServ... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteCalculationService,role=... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteEntityService,role=Polic... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteProcessService,role=Poli... ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/PolicyQuote) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(location=schema/policyQuote.xsd,prefix=pol,namespace=http://www.exam... ]]
+[[ Type(location=schema/drivingRecord.xsd,prefix=drv,namespace=http://dmv.co... ]]
+[[ Type(location=schema/creditCheck.xsd,prefix=cred,namespace=http://credita... ]]
+[[ Type(prefix=pps,namespace=http://www.example.org/policyQuoteProcessService) ]]
+[[ Type(prefix=pcs,namespace=http://www.example.org/policyQuoteCalculationSe... ]]
+[[ Type(prefix=pes,namespace=http://www.example.org/policyQuoteEntityService) ]]
+[[ Type(prefix=dmv,namespace=http://dmv.com/drivingRecordService) ]]
+[[ Type(prefix=ca,namespace=http://creditagency.com/creditCheckService) ]]
+protocol PolicyQuoteProcess {
+ role Driver, CreditCheckService, DrivingRecordService, PolicyQuoteCalculationService, PolicyQuoteEntityService, PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(request=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuote) from Driver to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordService) ]]
+ checkDrivingRecord(DrivingRecordRequest) from PolicyQuoteProcessService to DrivingRecordService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordCallbackSe... ]]
+ receiveDrivingRecord(DrivingRecordResponse) from DrivingRecordService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]]
+ choice {
+ label0():
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest) from PolicyQuoteProcessService to CreditCheckService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}CreditCheckService) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckResponse) from CreditCheckService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(request=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteCalculationService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(replyTo=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuoteReply) from PolicyQuoteCalculationService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(request=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteEntityService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(replyTo=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuoteReply) from PolicyQuoteEntityService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.3/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
+
+ label1():
+ [[ Fault(name=policyQuoteFault) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteFault) from PolicyQuoteProcessService to Driver;
+
+ }
+}
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-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -27,6 +27,7 @@
import org.savara.common.model.annotation.AnnotationDefinitions;
import org.savara.contract.model.FaultDetails;
import org.savara.contract.model.Interface;
+import org.savara.contract.model.MessageExchangePattern;
import org.savara.contract.model.Namespace;
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
@@ -217,8 +218,14 @@
}
for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) {
- createOperation(wsdls, contract, ret,
- intf.getMessageExchangePatterns().get(i), wsdlBinding);
+
+ // Only create operations for meps with type parameters
+ MessageExchangePattern mep=intf.getMessageExchangePatterns().get(i);
+
+ if (mep.getTypes().size() > 0) {
+ createOperation(wsdls, contract, ret,
+ mep, wsdlBinding);
+ }
}
// Only add portType to definition if they have atleast one operation
@@ -268,8 +275,13 @@
ret.setPortType(portType);
for (int i=0; i < intf.getMessageExchangePatterns().size(); i++) {
- createBindingOperation(wsdls, contract, ret,
- intf.getMessageExchangePatterns().get(i), wsdlBinding);
+ // Only create operations for meps with type parameters
+ MessageExchangePattern mep=intf.getMessageExchangePatterns().get(i);
+
+ if (mep.getTypes().size() > 0) {
+ createBindingOperation(wsdls, contract, ret,
+ mep, wsdlBinding);
+ }
}
// Only add portType to definition if they have atleast one operation
Deleted: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,260 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.wsdl.generator;
-
-import javax.wsdl.Definition;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
-import org.savara.contract.model.Contract;
-import org.scribble.common.logging.CachedJournal;
-import org.scribble.protocol.model.Role;
-import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
-import org.savara.protocol.contract.generator.ContractGenerator;
-import org.savara.protocol.contract.generator.ContractGeneratorFactory;
-import org.savara.wsdl.generator.soap.SOAPRPCWSDLBinding;
-
-public class GeneratorTest {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Protocol->WSDL Generator Tests");
-
- suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Broker"));
- suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Buyer"));
- suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierTxnProcessor"));
- suite.addTest(new ProtocolToWSDLTester("ESBBroker", "CreditAgency"));
- suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierQuoteEngine"));
-
- suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Buyer"));
- suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "CreditAgency"));
- suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Store"));
-
- suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Buyer"));
- suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Seller"));
-
- return suite;
- }
-
- protected static class ProtocolToWSDLTester extends TestCase {
-
- /**
- * This constructor is initialized with the test
- * name.
- *
- * @param name The test name
- * @param role The role
- */
- public ProtocolToWSDLTester(String name,
- String role) {
- super(name+"@"+role);
- m_name = name;
- m_role = role;
- }
-
- /**
- * This method runs the test.
- *
- * @param result The test result
- */
- public void run(TestResult result) {
-
- // Run test
- result.startTest(this);
-
- String filename="testmodels/contract/"+m_name+".spr";
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is == null) {
- result.addError(this,
- new Throwable("Unable to locate resource: "+filename));
- } else {
- CachedJournal journal=new CachedJournal();
-
- org.scribble.protocol.model.ProtocolModel model=null;
-
- ANTLRProtocolParser parser=new ANTLRProtocolParser();
- parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor());
-
- try {
- model = parser.parse(is, journal, null);
- } catch(Exception e) {
- result.addError(this, new Throwable("Parsing choreography failed"));
- }
-
- if (model == null) {
- result.addError(this, new Throwable("Model is null"));
- } else {
- ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
- if (cg != null) {
- Contract contract=cg.generate(model.getProtocol(), null, new Role(m_role), journal);
-
- if (contract != null) {
-
- // Convert to WSDL
- WSDLGenerator gen=WSDLGeneratorFactory.getWSDLGenerator();
-
- java.util.List<Definition> defns=gen.generate(contract, new SOAPRPCWSDLBinding());
-
- for (int i=0; i < defns.size(); i++) {
- Definition defn=defns.get(i);
-
- try {
- javax.wsdl.xml.WSDLWriter writer=
- javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
-
- java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
-
- writer.writeWSDL(defn, baos);
-
- byte[] b=baos.toByteArray();
-
- baos.close();
-
- checkResults(result, new String(b), "rpc", i);
- } catch(Exception e) {
- result.addError(this, e);
- }
- }
- } else {
- result.addError(this, new Throwable("No contract"));
- }
- }
- }
- }
-
- result.endTest(this);
- }
-
- /**
- * This method checks the generated BPEL against a
- * previously stored correct version.
- *
- * @param result The test result
- * @param bpel The BPEL
- */
- protected void checkResults(TestResult result, String wsdl, String binding, int num) {
- boolean f_valid=false;
-
- String filename="results/wsdl/"+m_name+"_"+m_role+"_"+binding+"_"+num+".wsdl";
-
- java.io.InputStream is=
- ClassLoader.getSystemResourceAsStream(filename);
-
- if (is != null) {
-
- try {
- byte[] b=new byte[is.available()];
-
- is.read(b);
-
- is.close();
-
- String orig=new String(b);
-
- if (orig.equals(wsdl) == false) {
- result.addError(this,
- new Throwable("Generated WSDL does not match stored version"));
- } else {
- f_valid = true;
- }
- } catch(Exception e) {
- result.addError(this, e);
- }
- } else {
- result.addError(this,
- new Throwable("Resulting WSDL '"+filename+
- "' not found for comparison"));
- }
-
- if (f_valid == false) {
- String srcfile="testmodels/contract/"+m_name+".spr";
-
- java.net.URL url=ClassLoader.getSystemResource(srcfile);
-
- /*
- try {
- url = org.eclipse.core.runtime.FileLocator.toFileURL(url);
- } catch(Exception e) {
- e.printStackTrace();
- }
- */
-
- if (url != null) {
- // URL will point to copy of test models in the classes folder, so need
- // to obtain reference back to source version
- java.io.File f=null;
-
- if (url.getFile().indexOf("target/test-classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
- } else if (url.getFile().indexOf("target/classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
- } else if (url.getFile().indexOf("classes") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
- } else if (url.getFile().indexOf("bin") != -1) {
- f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
- } else {
- result.addError(this, new Exception("Could not locate results folder to record expected result"));
- }
-
- if (f != null && f.exists()) {
- f = f.getParentFile().getParentFile().getParentFile();
-
- java.io.File resultsDir=new java.io.File(f, "results/wsdl");
-
- if (resultsDir.exists() == false) {
- resultsDir.mkdirs();
- }
-
- java.io.File resultFile=new java.io.File(resultsDir,
- m_name+"_"+m_role+"_"+binding+"_"+num+".generated");
-
- //if (resultFile.exists() == false) {
- try {
- java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
-
- fos.write(wsdl.getBytes());
-
- fos.flush();
- fos.close();
-
- } catch(Exception e){
- result.addError(this, e);
- }
- /*
- } else {
- System.err.println("NOTE: Generated output '"+resultFile+
- "' already exists - not being overwritten");
- }
- */
- } else {
- result.addError(this, new Throwable("Unable to obtain URL for model source '"+
- m_name+"': "+url));
- }
- }
- }
- }
-
- private String m_name=null;
- private String m_role=null;
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java (from rev 639, branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/GeneratorTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/ProtocolToWSDLGeneratorTest.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,263 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.wsdl.generator;
+
+import javax.wsdl.Definition;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+import org.savara.contract.model.Contract;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.parser.antlr.ANTLRProtocolParser;
+import org.savara.protocol.contract.generator.ContractGenerator;
+import org.savara.protocol.contract.generator.ContractGeneratorFactory;
+import org.savara.wsdl.generator.soap.SOAPRPCWSDLBinding;
+
+public class ProtocolToWSDLGeneratorTest {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Protocol->WSDL Generator Tests");
+
+ suite.addTest(new ProtocolToWSDLTester("PolicyQuote", "CreditCheckService"));
+ suite.addTest(new ProtocolToWSDLTester("PolicyQuote", "PolicyQuoteProcessService"));
+
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Broker"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierTxnProcessor"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "CreditAgency"));
+ suite.addTest(new ProtocolToWSDLTester("ESBBroker", "SupplierQuoteEngine"));
+
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "CreditAgency"));
+ suite.addTest(new ProtocolToWSDLTester("PurchaseGoods", "Store"));
+
+ suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Buyer"));
+ suite.addTest(new ProtocolToWSDLTester("ReqRespFault", "Seller"));
+
+ return suite;
+ }
+
+ protected static class ProtocolToWSDLTester extends TestCase {
+
+ /**
+ * This constructor is initialized with the test
+ * name.
+ *
+ * @param name The test name
+ * @param role The role
+ */
+ public ProtocolToWSDLTester(String name,
+ String role) {
+ super(name+"@"+role);
+ m_name = name;
+ m_role = role;
+ }
+
+ /**
+ * This method runs the test.
+ *
+ * @param result The test result
+ */
+ public void run(TestResult result) {
+
+ // Run test
+ result.startTest(this);
+
+ String filename="testmodels/contract/"+m_name+".spr";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is == null) {
+ result.addError(this,
+ new Throwable("Unable to locate resource: "+filename));
+ } else {
+ CachedJournal journal=new CachedJournal();
+
+ org.scribble.protocol.model.ProtocolModel model=null;
+
+ ANTLRProtocolParser parser=new ANTLRProtocolParser();
+ parser.setAnnotationProcessor(new org.savara.protocol.parser.AnnotationProcessor());
+
+ try {
+ model = parser.parse(is, journal, null);
+ } catch(Exception e) {
+ result.addError(this, new Throwable("Parsing choreography failed"));
+ }
+
+ if (model == null) {
+ result.addError(this, new Throwable("Model is null"));
+ } else {
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ if (cg != null) {
+ Contract contract=cg.generate(model.getProtocol(), null, new Role(m_role), journal);
+
+ if (contract != null) {
+
+ // Convert to WSDL
+ WSDLGenerator gen=WSDLGeneratorFactory.getWSDLGenerator();
+
+ java.util.List<Definition> defns=gen.generate(contract, new SOAPRPCWSDLBinding());
+
+ for (int i=0; i < defns.size(); i++) {
+ Definition defn=defns.get(i);
+
+ try {
+ javax.wsdl.xml.WSDLWriter writer=
+ javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
+
+ java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
+
+ writer.writeWSDL(defn, baos);
+
+ byte[] b=baos.toByteArray();
+
+ baos.close();
+
+ checkResults(result, new String(b), "rpc", i);
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ }
+ } else {
+ result.addError(this, new Throwable("No contract"));
+ }
+ }
+ }
+ }
+
+ result.endTest(this);
+ }
+
+ /**
+ * This method checks the generated BPEL against a
+ * previously stored correct version.
+ *
+ * @param result The test result
+ * @param bpel The BPEL
+ */
+ protected void checkResults(TestResult result, String wsdl, String binding, int num) {
+ boolean f_valid=false;
+
+ String filename="results/wsdl/"+m_name+"_"+m_role+"_"+binding+"_"+num+".wsdl";
+
+ java.io.InputStream is=
+ ClassLoader.getSystemResourceAsStream(filename);
+
+ if (is != null) {
+
+ try {
+ byte[] b=new byte[is.available()];
+
+ is.read(b);
+
+ is.close();
+
+ String orig=new String(b);
+
+ if (orig.equals(wsdl) == false) {
+ result.addError(this,
+ new Throwable("Generated WSDL does not match stored version"));
+ } else {
+ f_valid = true;
+ }
+ } catch(Exception e) {
+ result.addError(this, e);
+ }
+ } else {
+ result.addError(this,
+ new Throwable("Resulting WSDL '"+filename+
+ "' not found for comparison"));
+ }
+
+ if (f_valid == false) {
+ String srcfile="testmodels/contract/"+m_name+".spr";
+
+ java.net.URL url=ClassLoader.getSystemResource(srcfile);
+
+ /*
+ try {
+ url = org.eclipse.core.runtime.FileLocator.toFileURL(url);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+ */
+
+ if (url != null) {
+ // URL will point to copy of test models in the classes folder, so need
+ // to obtain reference back to source version
+ java.io.File f=null;
+
+ if (url.getFile().indexOf("target/test-classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/test-classes","src/test/resources"));
+ } else if (url.getFile().indexOf("target/classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("target/classes","src/test/resources"));
+ } else if (url.getFile().indexOf("classes") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources"));
+ } else if (url.getFile().indexOf("bin") != -1) {
+ f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources"));
+ } else {
+ result.addError(this, new Exception("Could not locate results folder to record expected result"));
+ }
+
+ if (f != null && f.exists()) {
+ f = f.getParentFile().getParentFile().getParentFile();
+
+ java.io.File resultsDir=new java.io.File(f, "results/wsdl");
+
+ if (resultsDir.exists() == false) {
+ resultsDir.mkdirs();
+ }
+
+ java.io.File resultFile=new java.io.File(resultsDir,
+ m_name+"_"+m_role+"_"+binding+"_"+num+".generated");
+
+ //if (resultFile.exists() == false) {
+ try {
+ java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile);
+
+ fos.write(wsdl.getBytes());
+
+ fos.flush();
+ fos.close();
+
+ } catch(Exception e){
+ result.addError(this, e);
+ }
+ /*
+ } else {
+ System.err.println("NOTE: Generated output '"+resultFile+
+ "' already exists - not being overwritten");
+ }
+ */
+ } else {
+ result.addError(this, new Throwable("Unable to obtain URL for model source '"+
+ m_name+"': "+url));
+ }
+ }
+ }
+ }
+
+ private String m_name=null;
+ private String m_role=null;
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_CreditCheckService_rpc_0.wsdl 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="CreditCheckService" targetNamespace="http://creditagency.com/creditCheckService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://creditagency.com/creditCheckService" xmlns:cred="http://creditagency.com/creditCheck" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="checkCreditRequest">
+ <wsdl:part name="content" type="cred:creditCheckRequest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="checkCreditResponse">
+ <wsdl:part name="content" type="cred:creditCheckResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="CreditCheckService">
+ <wsdl:operation name="checkCredit">
+ <wsdl:input message="tns:checkCreditRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:checkCreditResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CreditCheckServiceBinding" type="tns:CreditCheckService">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="checkCredit">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://creditagency.com/creditCheckService"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://creditagency.com/creditCheckService"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CreditCheckServiceService">
+ <wsdl:port name="CreditCheckServicePort" binding="tns:CreditCheckServiceBinding">
+ <soap:address location="http://localhost:8080/CreditCheckServiceService/CreditCheckServicePort"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PolicyQuote_PolicyQuoteProcessService_rpc_0.wsdl 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="PolicyQuoteProcessService" targetNamespace="http://www.example.org/policyQuoteProcessService" xmlns:drv="http://dmv.com/drivingRecord" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.org/policyQuoteProcessService" xmlns:pol="http://www.example.org/policyQuote" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:message name="policyQuoteFaultFault">
+ <wsdl:part name="content" type="pol:policyQuoteFault">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="receivePolicyQuoteResponse">
+ <wsdl:part name="content" type="pol:policyQuoteReply">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="receivePolicyQuoteRequest">
+ <wsdl:part name="content" type="pol:policyQuote">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="receiveDrivingRecordRequest">
+ <wsdl:part name="content" type="drv:drivingRecordResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="PolicyQuoteProcessService">
+ <wsdl:operation name="receivePolicyQuote">
+ <wsdl:input message="tns:receivePolicyQuoteRequest">
+ </wsdl:input>
+ <wsdl:output message="tns:receivePolicyQuoteResponse">
+ </wsdl:output>
+ <wsdl:fault name="policyQuoteFault" message="tns:policyQuoteFaultFault">
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="receiveDrivingRecord">
+ <wsdl:input message="tns:receiveDrivingRecordRequest">
+ </wsdl:input>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="PolicyQuoteProcessServiceBinding" type="tns:PolicyQuoteProcessService">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="receivePolicyQuote">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.example.org/policyQuoteProcessService"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" namespace="http://www.example.org/policyQuoteProcessService"/>
+ </wsdl:output>
+ <wsdl:fault name="policyQuoteFault">
+ <soap:fault name="policyQuoteFault" use="literal" namespace="http://www.example.org/policyQuoteProcessService"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ <wsdl:operation name="receiveDrivingRecord">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body use="literal" namespace="http://www.example.org/policyQuoteProcessService"/>
+ </wsdl:input>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="PolicyQuoteProcessServiceService">
+ <wsdl:port name="PolicyQuoteProcessServicePort" binding="tns:PolicyQuoteProcessServiceBinding">
+ <soap:address location="http://localhost:8080/PolicyQuoteProcessServiceService/PolicyQuoteProcess..."/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_CreditAgency_rpc_0.wsdl 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+<wsdl:definitions name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="checkCreditRequest">
- <wsdl:part name="content" type="tns:CreditCheckRequest">
+ <wsdl:part name="content" type="pur:CreditCheckRequest">
</wsdl:part>
</wsdl:message>
<wsdl:message name="CreditCheckFailedFault">
- <wsdl:part name="content" type="tns:CreditCheckInvalid">
+ <wsdl:part name="content" type="pur:CreditCheckInvalid">
</wsdl:part>
</wsdl:message>
<wsdl:message name="checkCreditResponse">
- <wsdl:part name="content" type="tns:CreditCheckOk">
+ <wsdl:part name="content" type="pur:CreditCheckOk">
</wsdl:part>
</wsdl:message>
<wsdl:portType name="CreditAgency">
<wsdl:operation name="checkCredit">
- <wsdl:input message="tns:checkCreditRequest">
+ <wsdl:input message="pur:checkCreditRequest">
</wsdl:input>
- <wsdl:output message="tns:checkCreditResponse">
+ <wsdl:output message="pur:checkCreditResponse">
</wsdl:output>
- <wsdl:fault name="CreditCheckFailed" message="tns:CreditCheckFailedFault">
+ <wsdl:fault name="CreditCheckFailed" message="pur:CreditCheckFailedFault">
</wsdl:fault>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="CreditAgencyBinding" type="tns:CreditAgency">
+ <wsdl:binding name="CreditAgencyBinding" type="pur:CreditAgency">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="checkCredit">
<soap:operation soapAction="" style="rpc"/>
@@ -38,7 +38,7 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="CreditAgencyService">
- <wsdl:port name="CreditAgencyPort" binding="tns:CreditAgencyBinding">
+ <wsdl:port name="CreditAgencyPort" binding="pur:CreditAgencyBinding">
<soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyPort"/>
</wsdl:port>
</wsdl:service>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/results/wsdl/PurchaseGoods_Store_rpc_0.wsdl 2011-02-09 23:15:27 UTC (rev 645)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="Store" targetNamespace="http://www.jboss.org/examples/store" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/examples/store" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+<wsdl:definitions name="Store" targetNamespace="http://www.jboss.org/examples/store" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.jboss.org/examples/store" xmlns:sto="http://www.jboss.org/examples/store" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:message name="BuyFailedFault">
<wsdl:part name="content" type="tns:BuyFailed">
</wsdl:part>
Added: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PolicyQuote.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/resources/testmodels/contract/PolicyQuote.spr 2011-02-09 23:15:27 UTC (rev 645)
@@ -0,0 +1,70 @@
+import xsd "{http://creditagency.com/creditCheck}creditCheckRequest" as CreditCheckRequest, "{http://creditagency.com/creditCheck}creditCheckResponse" as CreditCheckResponse from "http://creditagency.com/creditCheck";
+import xsd "{http://dmv.com/drivingRecord}drivingRecordRequest" as DrivingRecordRequest, "{http://dmv.com/drivingRecord}drivingRecordResponse" as DrivingRecordResponse from "http://dmv.com/drivingRecord";
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+import xsd "{http://www.example.org/policyQuote}policyQuote" as PolicyQuote, "{http://www.example.org/policyQuote}policyQuoteFault" as PolicyQuoteFault, "{http://www.example.org/policyQuote}policyQuoteReply" as PolicyQuoteReply from "http://www.example.org/policyQuote";
+[[ SourceComponent(id=//(a)choreographies.0) ]]
+[[ Namespace(name=http://www.pi4soa.org/PolicyQuote,role=Driver) ]]
+[[ Namespace(name=http://creditagency.com/creditCheckService,role=CreditChec... ]]
+[[ Namespace(name=http://dmv.com/drivingRecordService,role=DrivingRecordServ... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteCalculationService,role=... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteEntityService,role=Polic... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteProcessService,role=Poli... ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/PolicyQuote) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(location=schema/policyQuote.xsd,prefix=pol,namespace=http://www.exam... ]]
+[[ Type(location=schema/drivingRecord.xsd,prefix=drv,namespace=http://dmv.co... ]]
+[[ Type(location=schema/creditCheck.xsd,prefix=cred,namespace=http://credita... ]]
+[[ Type(prefix=pps,namespace=http://www.example.org/policyQuoteProcessService) ]]
+[[ Type(prefix=pcs,namespace=http://www.example.org/policyQuoteCalculationSe... ]]
+[[ Type(prefix=pes,namespace=http://www.example.org/policyQuoteEntityService) ]]
+[[ Type(prefix=dmv,namespace=http://dmv.com/drivingRecordService) ]]
+[[ Type(prefix=ca,namespace=http://creditagency.com/creditCheckService) ]]
+protocol PolicyQuoteProcess {
+ role Driver, CreditCheckService, DrivingRecordService, PolicyQuoteCalculationService, PolicyQuoteEntityService, PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(request=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuote) from Driver to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordService) ]]
+ checkDrivingRecord(DrivingRecordRequest) from PolicyQuoteProcessService to DrivingRecordService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordCallbackSe... ]]
+ receiveDrivingRecord(DrivingRecordResponse) from DrivingRecordService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]]
+ choice {
+ label0():
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest) from PolicyQuoteProcessService to CreditCheckService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}CreditCheckService) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckResponse) from CreditCheckService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(request=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteCalculationService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(replyTo=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuoteReply) from PolicyQuoteCalculationService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(request=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteEntityService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(replyTo=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuoteReply) from PolicyQuoteEntityService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.3/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
+
+ label1():
+ [[ Fault(name=policyQuoteFault) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteFault) from PolicyQuoteProcessService to Driver;
+
+ }
+}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-08 23:26:51 UTC (rev 644)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-02-09 23:15:27 UTC (rev 645)
@@ -41,6 +41,8 @@
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.contract.model.Namespace;
+import org.savara.protocol.contract.generator.ContractGenerator;
+import org.savara.protocol.contract.generator.ContractGeneratorFactory;
import org.savara.tools.core.ScribbleServices;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
@@ -253,14 +255,15 @@
Object target=generator.generate(local, journal, null);
if (target instanceof TProcess) {
- generateRoleProject(projectName, localRole, (TProcess)target, local, cdmResource);
+ generateRoleProject(projectName, localRole, (TProcess)target, local, cdmResource,
+ journal);
}
}
}
protected void generateRoleProject(String projectName, Role role,
TProcess bpelProcess, ProtocolModel localcm,
- IFile cdmResource) throws Exception {
+ IFile cdmResource, Journal journal) throws Exception {
final IProject proj=createProject(projectName);
@@ -305,12 +308,12 @@
new org.eclipse.core.runtime.NullProgressMonitor());
// Write the WSDL files
- generateWSDL(role, proj, localcm, cdmResource);
+ generateWSDL(role, proj, localcm, cdmResource, journal);
java.util.List<Role> roles=localcm.getProtocol().getRoles();
for (int i=0; i < roles.size(); i++) {
- generateWSDL(roles.get(i), proj, localcm, cdmResource);
+ generateWSDL(roles.get(i), proj, localcm, cdmResource, journal);
}
// Generate WSDL with partner link types
@@ -322,14 +325,20 @@
}
protected void generateWSDL(Role role, IProject proj, ProtocolModel localcm,
- IFile cdmResource) throws Exception {
+ IFile cdmResource, Journal journal) throws Exception {
- if (role.getProperties().containsKey(Contract.class.getName())) {
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ Contract contract=null;
+
+ if (cg != null) {
+ contract=cg.generate(m_protocolModel.getProtocol(), null, role, journal);
+ }
+
+ if (contract != null) {
javax.wsdl.xml.WSDLWriter writer=
javax.wsdl.factory.WSDLFactory.newInstance().newWSDLWriter();
org.savara.wsdl.generator.WSDLGenerator generator=
WSDLGeneratorFactory.getWSDLGenerator();
- Contract contract=(Contract)role.getProperties().get(Contract.class.getName());
// Generate BPEL folder
IPath bpelFolderPath=proj.getFullPath().append(
15 years, 2 months
- 1
- 0
savara SVN: r644 - in branches/experimental/2.0.x: bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator and 6 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-08 18:26:51 -0500 (Tue, 08 Feb 2011)
New Revision: 644
Added:
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/testmodels/protocol/PolicyQuote.spr
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/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java
branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolServices.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
Log:
Updated so if choice roles across paths are not consistent, then only a label is used.
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-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -437,173 +437,175 @@
TSequence seq=new TSequence();
- Contract contract=null;
-
- if ((InteractionUtil.isRequest(path) && !InteractionUtil.isSend(path)) ||
- (InteractionUtil.isResponse(path) && InteractionUtil.isSend(path))) {
- contract = ModelChangeUtils.getContract(context, role);
- } else if (InteractionUtil.isRequest(path)) {
- contract = ModelChangeUtils.getContract(context, elem.getToRole());
- } else {
- contract = ModelChangeUtils.getContract(context, elem.getFromRole());
- }
-
- // Handle when message signature
- if (InteractionUtil.isResponse(path)) {
- QName qname=null;
- if (InteractionUtil.isRequest(path)) {
- qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
- path.getMessageSignature().getOperation());
- } else if (InteractionUtil.isFaultResponse(path)) {
- qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionUtil.getFaultName(path));
+ if (path.getMessageSignature().getTypeReferences().size() > 0) {
+ Contract contract=null;
+
+ if ((InteractionUtil.isRequest(path) && !InteractionUtil.isSend(path)) ||
+ (InteractionUtil.isResponse(path) && InteractionUtil.isSend(path))) {
+ contract = ModelChangeUtils.getContract(context, role);
+ } else if (InteractionUtil.isRequest(path)) {
+ contract = ModelChangeUtils.getContract(context, elem.getToRole());
} else {
- qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
- path.getMessageSignature().getOperation());
+ contract = ModelChangeUtils.getContract(context, elem.getFromRole());
}
- String varName = qname.getLocalPart()+"Var";
-
- TVariable var=VariableUtil.getVariable(bpelModel, varName);
-
- if (var == null) {
- var = new TVariable();
- var.setName(varName);
+ // Handle when message signature
+ if (InteractionUtil.isResponse(path)) {
+ QName qname=null;
+ if (InteractionUtil.isRequest(path)) {
+ qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
+ path.getMessageSignature().getOperation());
+ } else if (InteractionUtil.isFaultResponse(path)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionUtil.getFaultName(path));
+ } else {
+ qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
+ path.getMessageSignature().getOperation());
+ }
- var.setMessageType(qname);
+ String varName = qname.getLocalPart()+"Var";
+
+ TVariable var=VariableUtil.getVariable(bpelModel, varName);
+
+ if (var == null) {
+ var = new TVariable();
+ var.setName(varName);
+
+ var.setMessageType(qname);
+
+ bpelModel.getVariables().getVariable().add(var);
+ }
+
+ TReply reply = new TReply();
+ seq.getActivity().add(reply);
- bpelModel.getVariables().getVariable().add(var);
- }
-
- TReply reply = new TReply();
- seq.getActivity().add(reply);
-
- // TODO: What about if multiple 'to' roles
- TPartnerLink pl=new TPartnerLink();
-
- pl.setMyRole(role.getName()+"Service");
- pl.setName(elem.getToRole().getName()+"To"+role.getName());
-
- String plt=elem.getToRole().getName()+"To"+role.getName()+"Service"+"LT";
-
- pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
+ // TODO: What about if multiple 'to' roles
+ TPartnerLink pl=new TPartnerLink();
- //portType = role.getName()+"PT";
-
- if (InteractionUtil.isFaultResponse(path)) {
- String faultName=InteractionUtil.getFaultName(path);
+ pl.setMyRole(role.getName()+"Service");
+ pl.setName(elem.getToRole().getName()+"To"+role.getName());
- // TODO: Not sure what to do about namespace here?
- reply.setFaultName(new QName(contract.getNamespace(), faultName));
- }
-
- if (varName != null) {
- reply.setVariable(varName);
- }
-
- // Create partner link
- TPartnerLink other=
- PartnerLinkUtil.getPartnerLink(bpelModel, pl.getName());
- if (other == null) {
- bpelModel.getPartnerLinks().getPartnerLink().add(pl);
- } else {
- if (other.getPartnerRole() == null &&
- pl.getPartnerRole() != null) {
- other.setPartnerRole(pl.getPartnerRole());
+ String plt=elem.getToRole().getName()+"To"+role.getName()+"Service"+"LT";
+
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
+
+ //portType = role.getName()+"PT";
+
+ if (InteractionUtil.isFaultResponse(path)) {
+ String faultName=InteractionUtil.getFaultName(path);
+
+ // TODO: Not sure what to do about namespace here?
+ reply.setFaultName(new QName(contract.getNamespace(), faultName));
}
- if (other.getMyRole() == null &&
- pl.getMyRole() != null) {
- other.setMyRole(pl.getMyRole());
+
+ if (varName != null) {
+ reply.setVariable(varName);
}
- }
-
- String portType=null;
-
- if (contract.getInterfaces().size() > 0) {
- portType = contract.getInterfaces().iterator().next().getName();
- }
-
- reply.setPartnerLink(pl.getName());
- reply.setPortType(new QName(contract.getNamespace(),portType));
- if (path.getMessageSignature() != null) {
- reply.setOperation(path.getMessageSignature().getOperation());
- }
-
- reply.setName(InteractionUtil.getName(path));
- } else {
- QName qname=null;
- if (InteractionUtil.isRequest(path)) {
- qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
- path.getMessageSignature().getOperation());
- } else if (InteractionUtil.isFaultResponse(path)) {
- qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionUtil.getFaultName(path));
+
+ // Create partner link
+ TPartnerLink other=
+ PartnerLinkUtil.getPartnerLink(bpelModel, pl.getName());
+ if (other == null) {
+ bpelModel.getPartnerLinks().getPartnerLink().add(pl);
+ } else {
+ if (other.getPartnerRole() == null &&
+ pl.getPartnerRole() != null) {
+ other.setPartnerRole(pl.getPartnerRole());
+ }
+ if (other.getMyRole() == null &&
+ pl.getMyRole() != null) {
+ other.setMyRole(pl.getMyRole());
+ }
+ }
+
+ String portType=null;
+
+ if (contract.getInterfaces().size() > 0) {
+ portType = contract.getInterfaces().iterator().next().getName();
+ }
+
+ reply.setPartnerLink(pl.getName());
+ reply.setPortType(new QName(contract.getNamespace(),portType));
+ if (path.getMessageSignature() != null) {
+ reply.setOperation(path.getMessageSignature().getOperation());
+ }
+
+ reply.setName(InteractionUtil.getName(path));
} else {
- qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
- path.getMessageSignature().getOperation());
- }
-
- String varName = qname.getLocalPart()+"Var";
-
- TVariable var=VariableUtil.getVariable(bpelModel, varName);
-
- if (var == null) {
- var = new TVariable();
- var.setName(varName);
+ QName qname=null;
+ if (InteractionUtil.isRequest(path)) {
+ qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
+ path.getMessageSignature().getOperation());
+ } else if (InteractionUtil.isFaultResponse(path)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionUtil.getFaultName(path));
+ } else {
+ qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
+ path.getMessageSignature().getOperation());
+ }
- var.setMessageType(qname);
+ String varName = qname.getLocalPart()+"Var";
+
+ TVariable var=VariableUtil.getVariable(bpelModel, varName);
+
+ if (var == null) {
+ var = new TVariable();
+ var.setName(varName);
+
+ var.setMessageType(qname);
+
+ bpelModel.getVariables().getVariable().add(var);
+ }
+
+ TInvoke invoke=new TInvoke();
+ seq.getActivity().add(invoke);
+
+ if (varName != null) {
+ invoke.setInputVariable(varName);
+ }
- bpelModel.getVariables().getVariable().add(var);
- }
-
- TInvoke invoke=new TInvoke();
- seq.getActivity().add(invoke);
-
- // TODO: What about if multiple 'to' roles
- TPartnerLink pl=new TPartnerLink();
-
- pl.setPartnerRole(elem.getToRole().getName()+"Requester");
- pl.setName(role.getName()+"To"+elem.getToRole().getName());
-
- String plt=role.getName()+"To"+elem.getToRole().getName()+"LT";
-
- pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
-
- //portType = interaction.getToRole().getName()+"PT";
-
- if (varName != null) {
- invoke.setInputVariable(varName);
- }
-
- // Create partner link
- TPartnerLink other=
- PartnerLinkUtil.getPartnerLink(bpelModel, pl.getName());
- if (other == null) {
- bpelModel.getPartnerLinks().getPartnerLink().add(pl);
- } else {
- if (other.getPartnerRole() == null &&
- pl.getPartnerRole() != null) {
- other.setPartnerRole(pl.getPartnerRole());
+ // TODO: What about if multiple 'to' roles
+ TPartnerLink pl=new TPartnerLink();
+
+ if (role != null && elem.getToRole() != null) {
+ pl.setPartnerRole(elem.getToRole().getName()+"Requester");
+ pl.setName(role.getName()+"To"+elem.getToRole().getName());
+
+ String plt=role.getName()+"To"+elem.getToRole().getName()+"LT";
+
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
+
+ // Create partner link
+ TPartnerLink other=
+ PartnerLinkUtil.getPartnerLink(bpelModel, pl.getName());
+ if (other == null) {
+ bpelModel.getPartnerLinks().getPartnerLink().add(pl);
+ } else {
+ if (other.getPartnerRole() == null &&
+ pl.getPartnerRole() != null) {
+ other.setPartnerRole(pl.getPartnerRole());
+ }
+ if (other.getMyRole() == null &&
+ pl.getMyRole() != null) {
+ other.setMyRole(pl.getMyRole());
+ }
+ }
}
- if (other.getMyRole() == null &&
- pl.getMyRole() != null) {
- other.setMyRole(pl.getMyRole());
+
+ String portType=null;
+
+ if (contract.getInterfaces().size() > 0) {
+ portType = contract.getInterfaces().iterator().next().getName();
}
+
+ invoke.setPartnerLink(pl.getName());
+ invoke.setPortType(new QName(contract.getNamespace(),portType));
+ if (path.getMessageSignature() != null) {
+ invoke.setOperation(path.getMessageSignature().getOperation());
+ }
+
+ invoke.setName(InteractionUtil.getName(path));
}
-
- String portType=null;
-
- if (contract.getInterfaces().size() > 0) {
- portType = contract.getInterfaces().iterator().next().getName();
- }
-
- invoke.setPartnerLink(pl.getName());
- invoke.setPortType(new QName(contract.getNamespace(),portType));
- if (path.getMessageSignature() != null) {
- invoke.setOperation(path.getMessageSignature().getOperation());
- }
-
- invoke.setName(InteractionUtil.getName(path));
}
// Process the activities within the conversation
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-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -51,6 +51,8 @@
suite.addTest(new ProtocolToBPELTester("ReqRespFault", "Buyer"));
suite.addTest(new ProtocolToBPELTester("ReqRespFault", "Seller"));
+ suite.addTest(new ProtocolToBPELTester("PolicyQuote", "PolicyQuoteProcessService"));
+
return suite;
}
@@ -77,8 +79,8 @@
*/
public void run(TestResult result) {
// Setup scribble services
- ProtocolServices.setProtocolProjector(
- new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
+ //ProtocolServices.setProtocolProjector(
+ // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
// Run test
result.startTest(this);
Added: 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 (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote(a)PolicyQuoteProcessService.bpel 2011-02-08 23:26:51 UTC (rev 644)
@@ -0,0 +1,49 @@
+<?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">
+ <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"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_DrivingRecordService.wsdl" namespace="http://dmv.com/drivingRecordService"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PolicyQuoteProcess_PolicyQuoteCalculationService.wsdl" namespace="http://www.example.org/policyQuoteCalculationService"/>
+ <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"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="pps:receivePolicyQuoteRequest" name="receivePolicyQuoteRequestVar"/>
+ <variable messageType="dmv:checkDrivingRecordRequest" name="checkDrivingRecordRequestVar"/>
+ <variable messageType="pps:receiveDrivingRecordRequest" name="receiveDrivingRecordRequestVar"/>
+ <variable messageType="ca:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="ca:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="pcs:calculatePolicyQuoteRequest" name="calculatePolicyQuoteRequestVar"/>
+ <variable messageType="pcs:calculatePolicyQuoteResponse" name="calculatePolicyQuoteResponseVar"/>
+ <variable messageType="pes:createPolicyQuoteRequest" name="createPolicyQuoteRequestVar"/>
+ <variable messageType="pes:createPolicyQuoteResponse" name="createPolicyQuoteResponseVar"/>
+ <variable messageType="pps:receivePolicyQuoteResponse" name="receivePolicyQuoteResponseVar"/>
+ <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"/>
+ <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"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply faultName="pps:policyQuoteFault" variable="policyQuoteFaultFaultVar" operation="receivePolicyQuote" portType="pps:PolicyQuoteProcessService" partnerLink="DriverToPolicyQuoteProcessService" name="Send_PolicyQuoteFault"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/testmodels/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/testmodels/protocol/PolicyQuote.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/testmodels/protocol/PolicyQuote.spr 2011-02-08 23:26:51 UTC (rev 644)
@@ -0,0 +1,70 @@
+import xsd "{http://creditagency.com/creditCheck}creditCheckRequest" as CreditCheckRequest, "{http://creditagency.com/creditCheck}creditCheckResponse" as CreditCheckResponse from "http://creditagency.com/creditCheck";
+import xsd "{http://dmv.com/drivingRecord}drivingRecordRequest" as DrivingRecordRequest, "{http://dmv.com/drivingRecord}drivingRecordResponse" as DrivingRecordResponse from "http://dmv.com/drivingRecord";
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+import xsd "{http://www.example.org/policyQuote}policyQuote" as PolicyQuote, "{http://www.example.org/policyQuote}policyQuoteFault" as PolicyQuoteFault, "{http://www.example.org/policyQuote}policyQuoteReply" as PolicyQuoteReply from "http://www.example.org/policyQuote";
+[[ SourceComponent(id=//(a)choreographies.0) ]]
+[[ Namespace(name=http://www.pi4soa.org/PolicyQuote,role=Driver) ]]
+[[ Namespace(name=http://creditagency.com/creditCheckService,role=CreditChec... ]]
+[[ Namespace(name=http://dmv.com/drivingRecordService,role=DrivingRecordServ... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteCalculationService,role=... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteEntityService,role=Polic... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteProcessService,role=Poli... ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/PolicyQuote) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(location=schema/policyQuote.xsd,prefix=pol,namespace=http://www.exam... ]]
+[[ Type(location=schema/drivingRecord.xsd,prefix=drv,namespace=http://dmv.co... ]]
+[[ Type(location=schema/creditCheck.xsd,prefix=cred,namespace=http://credita... ]]
+[[ Type(prefix=pps,namespace=http://www.example.org/policyQuoteProcessService) ]]
+[[ Type(prefix=pcs,namespace=http://www.example.org/policyQuoteCalculationSe... ]]
+[[ Type(prefix=pes,namespace=http://www.example.org/policyQuoteEntityService) ]]
+[[ Type(prefix=dmv,namespace=http://dmv.com/drivingRecordService) ]]
+[[ Type(prefix=ca,namespace=http://creditagency.com/creditCheckService) ]]
+protocol PolicyQuoteProcess {
+ role Driver, CreditCheckService, DrivingRecordService, PolicyQuoteCalculationService, PolicyQuoteEntityService, PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(request=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuote) from Driver to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordService) ]]
+ checkDrivingRecord(DrivingRecordRequest) from PolicyQuoteProcessService to DrivingRecordService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordCallbackSe... ]]
+ receiveDrivingRecord(DrivingRecordResponse) from DrivingRecordService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]]
+ choice {
+ label0():
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest) from PolicyQuoteProcessService to CreditCheckService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}CreditCheckService) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckResponse) from CreditCheckService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(request=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteCalculationService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(replyTo=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuoteReply) from PolicyQuoteCalculationService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(request=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteEntityService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(replyTo=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuoteReply) from PolicyQuoteEntityService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.3/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
+
+ label1():
+ [[ Fault(name=policyQuoteFault) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteFault) from PolicyQuoteProcessService to Driver;
+
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-02-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -73,8 +73,8 @@
@org.junit.Before
public void setup() {
- ProtocolServices.setProtocolProjector(
- new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
+ //ProtocolServices.setProtocolProjector(
+ // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
}
@org.junit.Test
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -61,8 +61,8 @@
*/
public void run(TestResult result) {
// Setup scribble services
- ProtocolServices.setProtocolProjector(
- new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
+ //ProtocolServices.setProtocolProjector(
+ // new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
// Run test
result.startTest(this);
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java 2011-02-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/osgi/Activator.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -29,11 +29,13 @@
org.savara.protocol.util.ProtocolServices.setParserManager(ppm);
// Initialize the protocol projector
+ /*
sref=context.getServiceReference(ProtocolProjector.class.getName());
ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
org.savara.protocol.util.ProtocolServices.setProtocolProjector(pp);
+ */
}
/*
Modified: branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolServices.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolServices.java 2011-02-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/bundles/org.savara.protocol/src/main/java/org/savara/protocol/util/ProtocolServices.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -60,13 +60,15 @@
}
*/
+ /*
public static ProtocolProjector getProtocolProjector() {
return(m_protocolProjector);
}
public static void setProtocolProjector(ProtocolProjector projector) {
m_protocolProjector = projector;
- }
+ }
+ */
public static ProtocolExportManager getProtocolExportManager() {
return(m_protocolExportManager);
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-08 22:16:03 UTC (rev 643)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-08 23:26:51 UTC (rev 644)
@@ -18,6 +18,7 @@
package org.savara.tools.core.osgi;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
@@ -59,6 +60,26 @@
super.start(context);
plugin = this;
+ // Make sure any bundles, associated with scribble, are started (excluding
+ // the designer itself)
+ Bundle[] bundles=context.getBundles();
+
+ for (int i=0; i < bundles.length; i++) {
+ Bundle bundle=bundles[i];
+
+ if (bundle != null) {
+ //Object val=bundle.getHeaders().get(SERVICE_COMPONENT);
+ if (bundle.getSymbolicName().startsWith("org.scribble.") &&
+ bundle.getSymbolicName().endsWith("designer") == false) {
+
+ //if (bundle.getState() == Bundle.RESOLVED) {
+ logger.fine("Pre-empt bundle start: "+bundle);
+ bundle.start();
+ //}
+ }
+ }
+ }
+
// Initialize the protocol parser manager
ServiceReference sref=context.getServiceReference(ProtocolParserManager.class.getName());
15 years, 2 months
- 1
- 0
savara SVN: r643 - in branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src: test/resources/results/protocol and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-08 17:16:03 -0500 (Tue, 08 Feb 2011)
New Revision: 643
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
Log:
If choice is associated with different roles, then don't generate the from/to roles, and put all content in each path (for now). Might need to determine one particular pair, and use labels for other paths.
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-02-07 23:21:41 UTC (rev 642)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-02-08 22:16:03 UTC (rev 643)
@@ -66,6 +66,9 @@
java.util.List<Role> toRoles=new java.util.Vector<Role>();
boolean f_when=false;
+ // Check if all paths are associated with the same from and to role
+ boolean f_sameRoles=isSameRoles(context, cdl);
+
// Process all of the activities within the
// choreography
java.util.Iterator<org.pi4soa.cdl.Activity> actiter=
@@ -87,7 +90,7 @@
// If interaction found, then make sure it is ignored when
// processing the when path contents
- if (locator.getInteraction() != null &&
+ if (f_sameRoles && locator.getInteraction() != null &&
locator.getInteraction().getExchangeDetails().size() > 0) {
context.ignore(locator.getInteraction().getExchangeDetails().get(0));
}
@@ -102,11 +105,40 @@
* possibly if same from/to roles.
*/
if (activity instanceof Choice) {
- blocks.addAll(((Choice)activity).getWhens());
+ if (f_sameRoles) {
+ blocks.addAll(((Choice)activity).getWhens());
+ } else {
+ When block=new When();
+
+ // Check if single path in choice
+ Choice c=(Choice)activity;
+
+ if (c.getWhens().size() == 1) {
+ // Make when message signature back into an interaction
+ org.scribble.protocol.model.Interaction i=
+ new org.scribble.protocol.model.Interaction();
+ i.derivedFrom(c.getWhens().get(0));
+
+ i.setMessageSignature(c.getWhens().get(0).getMessageSignature());
+ i.setFromRole(c.getFromRole());
+ i.getToRoles().add(c.getToRole());
+
+ block.getBlock().add(i);
+
+ // Add contained activities
+ block.getBlock().getContents().addAll(
+ c.getWhens().get(0).getBlock().getContents());
+ } else {
+ block.getBlock().add(activity);
+ }
+
+ blocks.add(block);
+ }
+
// TODO: If fromRole not set, use choice one? If fromRole set,
// then may need to compare? Same for two roles?
- if (fromRole == null) {
+ if (fromRole == null && f_sameRoles) {
fromRole = ((Choice)activity).getFromRole();
if (toRoles.contains(((Choice)activity).getToRole()) == false) {
@@ -117,7 +149,7 @@
When block=new When();
- if (locator.getInteraction() != null &&
+ if (f_sameRoles && locator.getInteraction() != null &&
locator.getInteraction().getExchangeDetails().size() > 0) {
// Get the first exchange details
@@ -202,6 +234,13 @@
}
}
}
+
+ if (b.getMessageSignature() == null) {
+ // Create label
+ MessageSignature ms=new MessageSignature();
+ ms.setOperation("label"+i);
+ b.setMessageSignature(ms);
+ }
}
/*
@@ -220,8 +259,10 @@
((org.scribble.protocol.model.Choice)ret).
getWhens().addAll(blocks);
- ((org.scribble.protocol.model.Choice)ret).
- setFromRole(new Role(fromRole));
+ if (fromRole != null) {
+ ((org.scribble.protocol.model.Choice)ret).
+ setFromRole(new Role(fromRole));
+ }
if (toRoles.size() == 1) {
((org.scribble.protocol.model.Choice)ret).setToRole(new Role(toRoles.get(0)));
@@ -258,6 +299,87 @@
return(ret);
}
+ protected boolean isSameRoles(ConverterContext context, org.pi4soa.cdl.Choice cdl) {
+ boolean ret=true;
+ Role fromRole=null;
+ Role toRole=null;
+
+ for (int i=0; ret == true && i < cdl.getActivities().size(); i++) {
+ org.pi4soa.cdl.Activity act=cdl.getActivities().get(i);
+ Role from=null;
+ Role to=null;
+
+ ConverterRule rule=ConverterRuleFactory.getConverter(
+ org.scribble.protocol.model.Activity.class, act);
+
+ if (rule != null) {
+
+ context.pushState();
+
+ // Find exchange details for this path
+ InteractionLocator locator=new InteractionLocator(act);
+
+ act.visit(locator);
+
+ org.scribble.protocol.model.Activity activity=
+ (org.scribble.protocol.model.Activity)
+ rule.convert(context,
+ org.scribble.protocol.model.Activity.class, act);
+
+ if (activity instanceof Choice) {
+ from = ((Choice)activity).getFromRole();
+ to = ((Choice)activity).getToRole();
+ } else if (activity != null) {
+
+ if (locator.getInteraction() != null &&
+ locator.getInteraction().getExchangeDetails().size() > 0) {
+
+ // Get the first exchange details
+ ExchangeDetails ed=locator.getInteraction().getExchangeDetails().get(0);
+
+ if (ed != null) {
+
+ from = InteractionConverterRuleImpl.getFromRole(context,
+ ed);
+
+ to = InteractionConverterRuleImpl.getToRole(context,
+ ed);
+ }
+ }
+ }
+
+ context.popState();
+ }
+
+ if (i == 0) {
+ fromRole = from;
+ toRole = to;
+ } else {
+ if (from != null) {
+ if (fromRole == null) {
+ ret = false;
+ } else {
+ ret = fromRole.equals(from);
+ }
+ } else {
+ ret = (fromRole == null);
+ }
+
+ if (to != null) {
+ if (toRole == null) {
+ ret = false;
+ } else {
+ ret = toRole.equals(to);
+ }
+ } else {
+ ret = (toRole == null);
+ }
+ }
+ }
+
+ return(ret);
+ }
+
public static class InteractionLocator implements CDLVisitor {
private Interaction m_interaction=null;
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-07 23:21:41 UTC (rev 642)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-08 22:16:03 UTC (rev 643)
@@ -32,9 +32,10 @@
[[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordCallbackSe... ]]
receiveDrivingRecord(DrivingRecordResponse) from DrivingRecordService to PolicyQuoteProcessService;
[[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]]
- choice from PolicyQuoteProcessService to CreditCheckService {
- [[ Correlation(request=checkCredit) ]]
- checkCredit(CreditCheckRequest):
+ choice {
+ label0():
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest) from PolicyQuoteProcessService to CreditCheckService;
[[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/(a)exchangeDetails.1) ]]
[[ Interface(name={http://www.pi4soa.org/PolicyQuote}CreditCheckService) ]]
[[ Correlation(replyTo=checkCredit) ]]
@@ -60,9 +61,10 @@
[[ Correlation(replyTo=receivePolicyQuote) ]]
receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
- [[ Fault(name=policyQuoteFault) ]]
- [[ Correlation(replyTo=receivePolicyQuote) ]]
- receivePolicyQuote(PolicyQuoteFault):
+ label1():
+ [[ Fault(name=policyQuoteFault) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteFault) from PolicyQuoteProcessService to Driver;
}
}
15 years, 2 months
- 1
- 0
savara SVN: r642 - in branches/experimental/2.0.x/bundles: org.savara.common.config.file and 5 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-07 18:21:41 -0500 (Mon, 07 Feb 2011)
New Revision: 642
Added:
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/resources/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/resources/savara.properties
Removed:
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.common.config.file/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java
Log:
Currently the file configuration implementation can only load from the contained savara.properties when deployed in an OSGi container. Not sure if will be possible to obtain the properties from an external property file.
Deleted: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java 2011-02-07 21:51:16 UTC (rev 641)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java 2011-02-07 23:21:41 UTC (rev 642)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.common.config;
-
-import org.savara.common.config.Configuration;
-
-/**
- * This class provides a file based configuration implementation.
- *
- * @author gbrown
- *
- */
-public class FileConfiguration implements Configuration {
-
- private java.util.ResourceBundle m_properties=null;
- private boolean f_initialized=false;
-
- private void initialize() {
- f_initialized = true;
- m_properties = java.util.ResourceBundle.getBundle("savara");
- }
-
- public String getProperty(String name) {
- if (f_initialized == false) {
- initialize();
- }
-
- return(m_properties == null ? null : m_properties.getString(name));
- }
-
-}
Property changes on: branches/experimental/2.0.x/bundles/org.savara.common.config.file
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.classpath
.project
Modified: branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF 2011-02-07 21:51:16 UTC (rev 641)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF 2011-02-07 23:21:41 UTC (rev 642)
@@ -7,5 +7,4 @@
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
-Require-Bundle: org.savara.common,
- org.junit
+Require-Bundle: org.savara.common
Modified: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java 2011-02-07 21:51:16 UTC (rev 641)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java 2011-02-07 23:21:41 UTC (rev 642)
@@ -32,6 +32,7 @@
private void initialize() {
f_initialized = true;
+
m_properties = java.util.ResourceBundle.getBundle("savara");
}
Modified: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java 2011-02-07 21:51:16 UTC (rev 641)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java 2011-02-07 23:21:41 UTC (rev 642)
@@ -1,10 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
package org.savara.common.config.file.osgi;
+import java.util.Properties;
+import java.util.logging.Logger;
+
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.savara.common.config.Configuration;
+import org.savara.common.config.file.FileConfiguration;
public class Activator implements BundleActivator {
+ private static final Logger _log=Logger.getLogger(Activator.class.getName());
+
private static BundleContext context;
static BundleContext getContext() {
@@ -17,6 +41,16 @@
*/
public void start(BundleContext bundleContext) throws Exception {
Activator.context = bundleContext;
+
+ Properties props = new Properties();
+
+ // Register parser manager
+ final Configuration config=new FileConfiguration();
+
+ context.registerService(Configuration.class.getName(),
+ config, props);
+
+ _log.info("Registered File based Configuration");
}
/*
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/resources/savara.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/resources/savara.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/resources/savara.properties 2011-02-07 23:21:41 UTC (rev 642)
@@ -0,0 +1 @@
+test.property = Hello World
15 years, 2 months
- 1
- 0
savara SVN: r641 - in branches/experimental/2.0.x/bundles: org.savara.common and 20 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-07 16:51:16 -0500 (Mon, 07 Feb 2011)
New Revision: 641
Added:
branches/experimental/2.0.x/bundles/org.savara.common.config.file/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/Copyright.txt
branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.common.config.file/build.properties
branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/file/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/file/FileConfigurationTest.java
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/resources/
branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/resources/savara.properties
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.common/build.properties
branches/experimental/2.0.x/bundles/pom.xml
Log:
File based configuration implementation.
Modified: branches/experimental/2.0.x/bundles/org.savara.common/build.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/build.properties 2011-02-07 20:17:44 UTC (rev 640)
+++ branches/experimental/2.0.x/bundles/org.savara.common/build.properties 2011-02-07 21:51:16 UTC (rev 641)
@@ -1,4 +1,4 @@
-source.. = src/java/
+source.. = src/main/java/
output.. = bin/
bin.includes = META-INF/,\
.
Added: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/config/FileConfiguration.java 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.common.config;
+
+import org.savara.common.config.Configuration;
+
+/**
+ * This class provides a file based configuration implementation.
+ *
+ * @author gbrown
+ *
+ */
+public class FileConfiguration implements Configuration {
+
+ private java.util.ResourceBundle m_properties=null;
+ private boolean f_initialized=false;
+
+ private void initialize() {
+ f_initialized = true;
+ m_properties = java.util.ResourceBundle.getBundle("savara");
+ }
+
+ public String getProperty(String name) {
+ if (f_initialized == false) {
+ initialize();
+ }
+
+ return(m_properties == null ? null : m_properties.getString(name));
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/Copyright.txt
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/Copyright.txt (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/Copyright.txt 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,17 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/META-INF/MANIFEST.MF 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SAVARA Common Config File
+Bundle-SymbolicName: org.savara.common.config.file
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.savara.common.config.file.osgi.Activator
+Bundle-Vendor: www.savara.org
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.osgi.framework;version="1.3.0"
+Require-Bundle: org.savara.common,
+ org.junit
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/build.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/build.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/build.properties 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,4 @@
+source.. = src/main/java/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/pom.xml 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.common.config.file</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Savara::Bundles::CommonConfigFile</name>
+
+ <parent>
+ <groupId>org.savara</groupId>
+ <artifactId>bundles</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.common</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/FileConfiguration.java 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.common.config.file;
+
+import org.savara.common.config.Configuration;
+
+/**
+ * This class provides a file based configuration implementation.
+ *
+ * @author gbrown
+ *
+ */
+public class FileConfiguration implements Configuration {
+
+ private java.util.ResourceBundle m_properties=null;
+ private boolean f_initialized=false;
+
+ private void initialize() {
+ f_initialized = true;
+ m_properties = java.util.ResourceBundle.getBundle("savara");
+ }
+
+ public String getProperty(String name) {
+ if (f_initialized == false) {
+ initialize();
+ }
+
+ return(m_properties == null ? null : m_properties.getString(name));
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/main/java/org/savara/common/config/file/osgi/Activator.java 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,30 @@
+package org.savara.common.config.file.osgi;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/file/FileConfigurationTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/file/FileConfigurationTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/java/org/savara/common/config/file/FileConfigurationTest.java 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.common.config.file;
+
+import static org.junit.Assert.*;
+
+public class FileConfigurationTest {
+
+ @org.junit.Test
+ public void testGetProperty() {
+ FileConfiguration config=new FileConfiguration();
+
+ String val=config.getProperty("test.property");
+
+ if (val == null) {
+ fail("'test.property' not found");
+ }
+
+ if (val.equals("testvalue") == false) {
+ fail("Unexpected value '"+val+"', expecting 'testvalue'");
+ }
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/resources/savara.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/resources/savara.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common.config.file/src/test/resources/savara.properties 2011-02-07 21:51:16 UTC (rev 641)
@@ -0,0 +1 @@
+test.property = testvalue
\ No newline at end of file
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-02-07 20:17:44 UTC (rev 640)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-02-07 21:51:16 UTC (rev 641)
@@ -23,6 +23,7 @@
<module>org.savara.activity</module>
<module>org.savara.bpel</module>
<module>org.savara.common</module>
+ <module>org.savara.common.config.file</module>
<module>org.savara.contract</module>
<module>org.savara.monitor</module>
<module>org.savara.monitor.sstore.rdbms</module>
15 years, 2 months
- 1
- 0
savara SVN: r640 - in branches/experimental/2.0.x: bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser and 3 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-07 15:17:44 -0500 (Mon, 07 Feb 2011)
New Revision: 640
Added:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/testmodels/cdm/PolicyQuote.cdm
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
Log:
Add policy quote choreo to testcases, and fix npe when fromRole not determined.
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-02-05 16:52:54 UTC (rev 639)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-02-07 20:17:44 UTC (rev 640)
@@ -103,6 +103,16 @@
*/
if (activity instanceof Choice) {
blocks.addAll(((Choice)activity).getWhens());
+
+ // TODO: If fromRole not set, use choice one? If fromRole set,
+ // then may need to compare? Same for two roles?
+ if (fromRole == null) {
+ fromRole = ((Choice)activity).getFromRole();
+
+ if (toRoles.contains(((Choice)activity).getToRole()) == false) {
+ toRoles.add(((Choice)activity).getToRole());
+ }
+ }
} else {
When block=new When();
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-05 16:52:54 UTC (rev 639)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/ParserTest.java 2011-02-07 20:17:44 UTC (rev 640)
@@ -32,6 +32,7 @@
TestSuite suite = new TestSuite("Choreography->Protocol Parser Tests");
suite.addTest(new ChoreographyToProtocolTester("ESBBroker"));
+ suite.addTest(new ChoreographyToProtocolTester("PolicyQuote"));
suite.addTest(new ChoreographyToProtocolTester("PurchaseGoods"));
suite.addTest(new ChoreographyToProtocolTester("ReqRespFault"));
Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-07 20:17:44 UTC (rev 640)
@@ -0,0 +1,68 @@
+import xsd "{http://creditagency.com/creditCheck}creditCheckRequest" as CreditCheckRequest, "{http://creditagency.com/creditCheck}creditCheckResponse" as CreditCheckResponse from "http://creditagency.com/creditCheck";
+import xsd "{http://dmv.com/drivingRecord}drivingRecordRequest" as DrivingRecordRequest, "{http://dmv.com/drivingRecord}drivingRecordResponse" as DrivingRecordResponse from "http://dmv.com/drivingRecord";
+import xsd "{http://www.w3.org/2001/XMLSchema}string" as IDSSNType, "{http://www.w3.org/2001/XMLSchema}anyURI" as URITokenType from "http://www.w3.org/2001/XMLSchema";
+import xsd "{http://www.example.org/policyQuote}policyQuote" as PolicyQuote, "{http://www.example.org/policyQuote}policyQuoteFault" as PolicyQuoteFault, "{http://www.example.org/policyQuote}policyQuoteReply" as PolicyQuoteReply from "http://www.example.org/policyQuote";
+[[ SourceComponent(id=//(a)choreographies.0) ]]
+[[ Namespace(name=http://www.pi4soa.org/PolicyQuote,role=Driver) ]]
+[[ Namespace(name=http://creditagency.com/creditCheckService,role=CreditChec... ]]
+[[ Namespace(name=http://dmv.com/drivingRecordService,role=DrivingRecordServ... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteCalculationService,role=... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteEntityService,role=Polic... ]]
+[[ Namespace(name=http://www.example.org/policyQuoteProcessService,role=Poli... ]]
+[[ Type(prefix=tns,namespace=http://www.pi4soa.org/PolicyQuote) ]]
+[[ Type(prefix=xsd,namespace=http://www.w3.org/2001/XMLSchema) ]]
+[[ Type(location=schema/policyQuote.xsd,prefix=pol,namespace=http://www.exam... ]]
+[[ Type(location=schema/drivingRecord.xsd,prefix=drv,namespace=http://dmv.co... ]]
+[[ Type(location=schema/creditCheck.xsd,prefix=cred,namespace=http://credita... ]]
+[[ Type(prefix=pps,namespace=http://www.example.org/policyQuoteProcessService) ]]
+[[ Type(prefix=pcs,namespace=http://www.example.org/policyQuoteCalculationSe... ]]
+[[ Type(prefix=pes,namespace=http://www.example.org/policyQuoteEntityService) ]]
+[[ Type(prefix=dmv,namespace=http://dmv.com/drivingRecordService) ]]
+[[ Type(prefix=ca,namespace=http://creditagency.com/creditCheckService) ]]
+protocol PolicyQuoteProcess {
+ role Driver, CreditCheckService, DrivingRecordService, PolicyQuoteCalculationService, PolicyQuoteEntityService, PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.0/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(request=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuote) from Driver to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordService) ]]
+ checkDrivingRecord(DrivingRecordRequest) from PolicyQuoteProcessService to DrivingRecordService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}DrivingRecordCallbackSe... ]]
+ receiveDrivingRecord(DrivingRecordResponse) from DrivingRecordService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/(a)activities.3) ]]
+ choice from PolicyQuoteProcessService to CreditCheckService {
+ [[ Correlation(request=checkCredit) ]]
+ checkCredit(CreditCheckRequest):
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}CreditCheckService) ]]
+ [[ Correlation(replyTo=checkCredit) ]]
+ checkCredit(CreditCheckResponse) from CreditCheckService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(request=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteCalculationService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.1/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteCalculationS... ]]
+ [[ Correlation(replyTo=calculatePolicyQuote) ]]
+ calculatePolicyQuote(PolicyQuoteReply) from PolicyQuoteCalculationService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(request=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuote) from PolicyQuoteProcessService to PolicyQuoteEntityService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.2/(a)exchangeDetails.1) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteEntityService) ]]
+ [[ Correlation(replyTo=createPolicyQuote) ]]
+ createPolicyQuote(PolicyQuoteReply) from PolicyQuoteEntityService to PolicyQuoteProcessService;
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.3/(a)exchangeDetails.0) ]]
+ [[ Interface(name={http://www.pi4soa.org/PolicyQuote}PolicyQuoteProcessService) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
+
+ [[ Fault(name=policyQuoteFault) ]]
+ [[ Correlation(replyTo=receivePolicyQuote) ]]
+ receivePolicyQuote(PolicyQuoteFault):
+
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/testmodels/cdm/PolicyQuote.cdm
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/testmodels/cdm/PolicyQuote.cdm (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/testmodels/cdm/PolicyQuote.cdm 2011-02-07 20:17:44 UTC (rev 640)
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="MacRoman"?>
+<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for PolicyQuote global process" name="PolicyQuote" author="jdelong" version="2" targetNamespace="http://www.pi4soa.org/PolicyQuote">
+ <typeDefinitions>
+ <nameSpaces description="Target Namespace for PolicyQuote" prefix="tns" uRI="http://www.pi4soa.org/PolicyQuote"/>
+ <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/>
+ <nameSpaces prefix="pol" uRI="http://www.example.org/policyQuote" schemaLocation="schema/policyQuote.xsd"/>
+ <nameSpaces prefix="drv" uRI="http://dmv.com/drivingRecord" schemaLocation="schema/drivingRecord.xsd"/>
+ <nameSpaces prefix="cred" uRI="http://creditagency.com/creditCheck" schemaLocation="schema/creditCheck.xsd"/>
+ <nameSpaces prefix="pps" uRI="http://www.example.org/policyQuoteProcessService" schemaLocation=""/>
+ <nameSpaces prefix="pcs" uRI="http://www.example.org/policyQuoteCalculationService" schemaLocation=""/>
+ <nameSpaces prefix="pes" uRI="http://www.example.org/policyQuoteEntityService" schemaLocation=""/>
+ <nameSpaces prefix="dmv" uRI="http://dmv.com/drivingRecordService"/>
+ <nameSpaces prefix="ca" uRI="http://creditagency.com/creditCheckService"/>
+ <informationTypes description="This is the information type CreditCheckRequest" name="CreditCheckRequest" elementName="cred:creditCheckRequest"/>
+ <informationTypes description="This is the information type CreditCheckResponse" name="CreditCheckResponse" elementName="cred:creditCheckResponse"/>
+ <informationTypes description="This is the information type DrivingRecordRequest" name="DrivingRecordRequest" elementName="drv:drivingRecordRequest"/>
+ <informationTypes description="This is the information type DrivingRecordResponse" name="DrivingRecordResponse" typeName="" elementName="drv:drivingRecordResponse"/>
+ <informationTypes description="This is the information type IDSSNType" name="IDSSNType" typeName="xsd:string"/>
+ <informationTypes description="This is the information type PolicyQuote" name="PolicyQuote" typeName="" elementName="pol:policyQuote"/>
+ <informationTypes description="This is the information type PolicyQuoteFault" name="PolicyQuoteFault" typeName="" elementName="pol:policyQuoteFault"/>
+ <informationTypes description="This is the information type PolicyQuoteReply" name="PolicyQuoteReply" typeName="" elementName="pol:policyQuoteReply"/>
+ <informationTypes description="This is the information type URITokenType" name="URITokenType" elementName="xsd:anyURI"/>
+ <tokens description="This is the token IDSSN" name="IDSSN" informationType="//@typeDefinitions/(a)informationTypes.4"/>
+ <tokens description="This is the token URIToken" name="URIToken" informationType="//@typeDefinitions/(a)informationTypes.8"/>
+ <tokenLocators description="This is the token locator CreditCheckRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.0" query="//cred:ssn/text()" name="CreditCheckRequestIDLocator"/>
+ <tokenLocators description="This is the token locator CreditCheckResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.1" query="//cred:ssn/text()" name="CreditCheckResponseIDLocator"/>
+ <tokenLocators description="This is the token locator DrivingRecordRequestIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.2" query="//drv:ssn/text()" name="DrivingRecordRequestIDLocator"/>
+ <tokenLocators description="This is the token locator DrivingRecordResponseIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.3" query="//drv:ssn/text()" name="DrivingRecordResponseIDLocator"/>
+ <tokenLocators description="This is the token locator PolicyQuoteFaultIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.6" query="//pol:ssn/text()" name="PolicyQuoteFaultIDLocator"/>
+ <tokenLocators description="This is the token locator PolicyQuoteIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.5" query="//pol:ssn/text()" name="PolicyQuoteIDLocator"/>
+ <tokenLocators description="This is the token locator PolicyQuoteReplyIDLocator" token="//@typeDefinitions/(a)tokens.0" informationType="//@typeDefinitions/(a)informationTypes.7" query="//pol:ssn/text()" name="PolicyQuoteResponseIDLocator"/>
+ <roleTypes description="This is the role type CreditCheckService" name="CreditCheckService">
+ <behaviors description="This is the behavior CreditCheckService" name="CreditCheckService"/>
+ </roleTypes>
+ <roleTypes description="This is the role type Driver" name="Driver">
+ <behaviors description="This is the behavior Driver" name="Driver"/>
+ </roleTypes>
+ <roleTypes description="This is the role type DrivingRecordCallbackService" name="DrivingRecordCallbackService">
+ <behaviors description="This is the behavior DrivingRecordCallbackService" name="DrivingRecordCallbackService"/>
+ </roleTypes>
+ <roleTypes description="This is the role type DrivingRecordService" name="DrivingRecordService">
+ <behaviors description="This is the behavior DrivingRecordService" name="DrivingRecordService" interface=""/>
+ </roleTypes>
+ <roleTypes description="This is the role type PolicyQuoteCalculationService" name="PolicyQuoteCalculationService">
+ <behaviors description="This is the behavior PolicyQuoteCalculationService" name="PolicyQuoteCalculationService"/>
+ </roleTypes>
+ <roleTypes description="This is the role type PolicyQuoteEntityService" name="PolicyQuoteEntityService">
+ <behaviors description="This is the behavior PolicyQuoteEntityService" name="PolicyQuoteEntityService"/>
+ </roleTypes>
+ <roleTypes description="This is the role type PolicyQuoteProcessService" name="PolicyQuoteProcessService">
+ <behaviors description="This is the behavior PolicyQuoteProcessService" name="PolicyQuoteProcessService"/>
+ </roleTypes>
+ <relationshipTypes description="Relationship between Customer and InsuranceAgency" name="DriverPolicyQuote" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.6"/>
+ <relationshipTypes description="Relationship between DrivingRecordService and DrivingRecordCallbackService" name="DrivingRecordDrivingRecordCallback" firstRoleType="//@typeDefinitions/(a)roleTypes.3" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/>
+ <relationshipTypes description="Relationship between InsuranceAgency and CreditAgency" name="PolicyQuoteCreditCheck" firstRoleType="//@typeDefinitions/(a)roleTypes.6" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/>
+ <relationshipTypes description="Relationship between InsuranceAgency and DMV" name="PolicyQuoteDrivingRecord" firstRoleType="//@typeDefinitions/(a)roleTypes.6" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/>
+ <relationshipTypes description="Relationship between PolicyQuoteService and calculatePolicyQuote" name="PolicyQuotePolicyQuoteCalculation" firstRoleType="//@typeDefinitions/(a)roleTypes.6" secondRoleType="//@typeDefinitions/(a)roleTypes.4"/>
+ <relationshipTypes description="Relationship between PolicyQuoteService and PolicyQuoteEntityService" name="PolicyQuotePolicyQuoteEntity" firstRoleType="//@typeDefinitions/(a)roleTypes.6" secondRoleType="//@typeDefinitions/(a)roleTypes.5"/>
+ <participantTypes description="This is the participant type Driver" name="Driver" roleTypes="//@typeDefinitions/(a)roleTypes.1"/>
+ <participantTypes description="This is the participant type ca:CreditCheckService" name="ca:CreditCheckService" roleTypes="//@typeDefinitions/(a)roleTypes.0"/>
+ <participantTypes description="This is the participant type dmv:DrivingRecordService" name="dmv:DrivingRecordService" roleTypes="//@typeDefinitions/(a)roleTypes.3"/>
+ <participantTypes description="This is the participant type pcs:PolicyQuoteCalculationService" name="pcs:PolicyQuoteCalculationService" roleTypes="//@typeDefinitions/(a)roleTypes.4"/>
+ <participantTypes description="This is the participant type pes:PolicyQuoteEntityService" name="pes:PolicyQuoteEntityService" roleTypes="//@typeDefinitions/(a)roleTypes.5"/>
+ <participantTypes description="This is the participant type pps:PolicyQuoteProcessService" name="pps:PolicyQuoteProcessService" roleTypes="//@typeDefinitions/(a)roleTypes.2 //@typeDefinitions/(a)roleTypes.6"/>
+ <channelTypes description="This is the channel type CreditCheckChannel" name="CreditCheckChannel" behavior="//@typeDefinitions/@roleTypes.0/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.0">
+ <identities description="IDSSN" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type DrivingRecordCallbackChannel" name="DrivingRecordCallbackChannel" behavior="//@typeDefinitions/@roleTypes.2/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.2">
+ <identities description="IDSSN
" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type DrivingRecordChannel" name="DrivingRecordChannel" behavior="//@typeDefinitions/@roleTypes.3/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.3">
+ <identities description="IDSSN" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type PolicyQuoteCalculationChannel" name="PolicyQuoteCalculationChannel" behavior="//@typeDefinitions/@roleTypes.4/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.4">
+ <identities description="IDSSN" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type PolicyQuoteEntityChannel" name="PolicyQuoteEntityChannel" behavior="//@typeDefinitions/@roleTypes.5/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.5">
+ <identities description="IDSSN" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ <channelTypes description="This is the channel type PolicyQuoteProcessChannel" name="PolicyQuoteProcessChannel" behavior="//@typeDefinitions/@roleTypes.6/(a)behaviors.0" referenceToken="//@typeDefinitions/(a)tokens.1" roleType="//@typeDefinitions/(a)roleTypes.6">
+ <identities description="IDSSN" tokens="//@typeDefinitions/(a)tokens.0"/>
+ </channelTypes>
+ </typeDefinitions>
+ <choreographies description="Choreography flow for the PolicyQuote process" name="PolicyQuoteProcess" root="true">
+ <variableDefinitions description="Channel to facilitate interaction to CreditScoringService" name="CreditCheckServiceChannel" type="//@typeDefinitions/(a)channelTypes.0"/>
+ <variableDefinitions name="CreditCheckVar" type="//@typeDefinitions/(a)informationTypes.0"/>
+ <variableDefinitions description="Channel to facilitate interaction to DrivingRecordCallbackService" name="DrivingRecordCallbackServiceChannel" type="//@typeDefinitions/(a)channelTypes.1"/>
+ <variableDefinitions description="This is the variable DrivingRecordResponseVar" name="DrivingRecordResponseVar" type="//@typeDefinitions/(a)informationTypes.3"/>
+ <variableDefinitions description="Channel to facilitate interaction to DrivingRecordService" name="DrivingRecordServiceChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
+ <variableDefinitions description="This is the variable PolicyQuoteCalculationResponseVar" name="PolicyQuoteCalculationResponseVar" type="//@typeDefinitions/(a)informationTypes.7"/>
+ <variableDefinitions description="Channel to facilitate interaction to PolicyQuoteCalculationService" name="PolicyQuoteCalculationServiceChannelChannel" type="//@typeDefinitions/(a)channelTypes.3"/>
+ <variableDefinitions name="PolicyQuoteCalculationVar" type="//@typeDefinitions/(a)informationTypes.5"/>
+ <variableDefinitions description="Channel to facilitate interaction to PolicyQuoteEntityService" name="PolicyQuoteEntityChannelChannel" type="//@typeDefinitions/(a)channelTypes.4"/>
+ <variableDefinitions description="This is the variable PolicyQuoteEntityResponseVar" name="PolicyQuoteEntityResponseVar" type="//@typeDefinitions/(a)informationTypes.7"/>
+ <variableDefinitions name="PolicyQuoteEntityVar" type="//@typeDefinitions/(a)informationTypes.5"/>
+ <variableDefinitions description="Channel to facilitate interaction to PolicyQuoteService" name="PolicyQuoteProcessServiceChannel" type="//@typeDefinitions/(a)channelTypes.5"/>
+ <variableDefinitions name="PolicyQuoteRequestVar" type="//@typeDefinitions/(a)informationTypes.5"/>
+ <variableDefinitions name="PolicyQuoteResponseVar" type="//@typeDefinitions/(a)informationTypes.7"/>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="PolicyQuoteRequest" operation="receivePolicyQuote" channelVariable="//@choreographies.0/(a)variableDefinitions.11" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction PolicyQuoteRequest" name="PolicyQuoteRequest" type="//@typeDefinitions/(a)informationTypes.5" sendVariable="//@choreographies.0/(a)variableDefinitions.12">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://www.example.org/policyQuoteProcessService}Pol... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="DrivingRecordRequest" operation="checkDrivingRecord" channelVariable="//@choreographies.0/(a)variableDefinitions.4" relationship="//@typeDefinitions/(a)relationshipTypes.3">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction DrivingRecordRequest" name="DrivingRecordRequest" type="//@typeDefinitions/(a)informationTypes.2">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://dmv.com/drivingRecordService}DrivingRecordSer... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="DrivingRecordResponse" operation="receiveDrivingRecord" channelVariable="//@choreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction DrivingRecordResponse" name="DrivingRecordResponse" type="//@typeDefinitions/(a)informationTypes.3" receiveVariable="//@choreographies.0/(a)variableDefinitions.3">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://www.example.org/policyQuoteProcessService}Pol... type of destination;enum;endpoint address,service name;endpoint address}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Choice" description="NumberOfTickets">
+ <activities xsi:type="org.pi4soa.cdl:Conditional" description="LessThanOrEqualTo4" name="LessThanOrEqualTo4" expression="cdl:getVariable('DrivingRecordResponseVar', ' ' , '//drv:numberOfTickets/text()', 'DrivingRecordCallbackService') <= 4">
+ <activities xsi:type="org.pi4soa.cdl:Sequence">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="CreditCheck" operation="checkCredit" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CreditCheck" name="CreditCheckRequest" type="//@typeDefinitions/(a)informationTypes.0">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://creditagency.com/creditCheckService}CreditChe... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CreditCheck" name="CreditCheckResponse" type="//@typeDefinitions/(a)informationTypes.1" action="Respond">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://creditagency.com/creditCheckService}CreditChe... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="PolicyQuoteCalculation" operation="calculatePolicyQuote" channelVariable="//@choreographies.0/(a)variableDefinitions.6" relationship="//@typeDefinitions/(a)relationshipTypes.4">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction PolicyQuoteCalculation" name="PolicyQuoteCalculation" type="//@typeDefinitions/(a)informationTypes.5" sendVariable="//@choreographies.0/(a)variableDefinitions.7">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;jms:queue/PolicyQuoteCalculation_ESB}}"
		type="{{Type;The type of destination;enum;endpoint address,service name;endpoint address}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction PolicyQuoteCalculation" name="PolicyQuoteCalculationReply" type="//@typeDefinitions/(a)informationTypes.7" action="Respond" receiveVariable="//@choreographies.0/(a)variableDefinitions.5">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;jms:queue/PolicyQuoteCalculation_ESB_reply}}"
		type="{{Type;The type of destination;enum;endpoint address,service name;endpoint address}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="PolicyQuoteEntity" operation="createPolicyQuote" channelVariable="//@choreographies.0/(a)variableDefinitions.8" relationship="//@typeDefinitions/(a)relationshipTypes.5">
+ <exchangeDetails description="This is the exchange details for the request exchange associated with interaction PolicyQuoteEntity" name="PolicyQuoteEntity" type="//@typeDefinitions/(a)informationTypes.5" sendVariable="//@choreographies.0/(a)variableDefinitions.10">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;jms:queue/PolicyQuoteEntity_ESB}}"
		type="{{Type;The type of destination;enum;endpoint address,service name;endpoint address}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction PolicyQuoteEntity" name="PolicyQuoteEntityReply" type="//@typeDefinitions/(a)informationTypes.7" action="Respond" receiveVariable="//@choreographies.0/(a)variableDefinitions.9">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;jms:queue/PolicyQuoteEntity_ESB_reply}}"
		type="{{Type;The type of destination;enum;endpoint address,service name;endpoint address}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="PolicyQuoteResponse" operation="receivePolicyQuote" channelVariable="//@choreographies.0/(a)variableDefinitions.11" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction PolicyQuoteResponse" name="PolicyQuoteResponse" type="//@typeDefinitions/(a)informationTypes.7" action="Respond" sendVariable="//@choreographies.0/(a)variableDefinitions.13" receiveVariable="//@choreographies.0/(a)variableDefinitions.13">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://www.example.org/policyQuoteProcessService}Pol... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ </activities>
+ </activities>
+ <activities xsi:type="org.pi4soa.cdl:Conditional" description="GreaterThan4" name="GreaterThan4" expression="cdl:getVariable('DrivingRecordResponseVar', ' ' , '//drv:numberOfTickets/text()', 'DrivingRecordCallbackService') > 4">
+ <activities xsi:type="org.pi4soa.cdl:Interaction" name="PolicyQuoteInelligible" operation="receivePolicyQuote" channelVariable="//@choreographies.0/(a)variableDefinitions.11" relationship="//@typeDefinitions/(a)relationshipTypes.0">
+ <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction PolicyQuoteInelligible" name="PolicyQuoteInelligible" type="//@typeDefinitions/(a)informationTypes.6" action="Respond" faultName="policyQuoteFault">
+ <semanticAnnotations annotation="<validator>
	<destination name="{{Destination;The URI for the destination;string;;{http://www.example.org/policyQuoteProcessService}Pol... type of destination;enum;endpoint address,service name;service name}}" />
		dynamicReplyTo="{{Dynamic ReplyTo;Whether the replyTo destination is dynamic;boolean;;false}}" />
</validator>
" name="validator"/>
+ </exchangeDetails>
+ </activities>
+ </activities>
+ </activities>
+ </choreographies>
+</org.pi4soa.cdl:Package>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-05 16:52:54 UTC (rev 639)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/src/java/org/savara/tools/core/osgi/Activator.java 2011-02-07 20:17:44 UTC (rev 640)
@@ -20,6 +20,7 @@
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
import org.savara.tools.core.ScribbleServices;
import org.scribble.protocol.parser.ProtocolParserManager;
import org.scribble.protocol.projection.ProtocolProjector;
@@ -42,6 +43,8 @@
// The shared instance
private static Activator plugin;
+ private org.osgi.util.tracker.ServiceTracker m_protocolProjectorTracker=null;
+
/**
* The constructor
*/
@@ -66,9 +69,27 @@
// Initialize the protocol projector
sref=context.getServiceReference(ProtocolProjector.class.getName());
- ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
-
- ScribbleServices.setProtocolProjector(pp);
+ if (sref != null) {
+ ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
+ ScribbleServices.setProtocolProjector(pp);
+ } else {
+ // Create service tracker
+ m_protocolProjectorTracker = new ServiceTracker(context,
+ ProtocolProjector.class.getName(), null) {
+
+ public Object addingService(ServiceReference ref) {
+ Object ret=super.addingService(ref);
+
+ logger.fine("Projector being set: "+ret);
+
+ ScribbleServices.setProtocolProjector((ProtocolProjector)ret);
+
+ return(ret);
+ }
+ };
+
+ m_protocolProjectorTracker.open();
+ }
}
/*
15 years, 2 months
- 1
- 0