[savara-commits] savara SVN: r520 - in branches/experimental/2.0.x/bundles: org.savara.bpel/lib and 8 other directories.

Author: objectiser Date: 2011-01-01 13:12:26 -0500 (Sat, 01 Jan 2011) New Revision: 520 Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/ branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 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.pi4soa.cdm/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java Log: Added jaxb libs to the BPEL bundle to gain access to the namespace mapper which appears to have been changed in the more recent JDK versions. This moved the namespace/prefix definitions to the root BPEL element, and also enabled predefined prefixes to be used. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-01 18:12:26 UTC (rev 520) @@ -1,21 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="src" path="src/main/java" including="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> - <classpathentry kind="src" path="/org.savara.contract.model"/> - <classpathentry kind="src" path="/org.savara.core"/> - <classpathentry kind="src" path="/org.savara.wsdl"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> - <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> -</classpath> \ No newline at end of file + <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry including="**/*.java" kind="src" path="src/main/java"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/> + <classpathentry kind="src" path="/org.savara.contract.model"/> + <classpathentry kind="src" path="/org.savara.core"/> + <classpathentry kind="src" path="/org.savara.wsdl"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol.parser/2.0.0-SNAPSHOT/org.scribble.protocol.parser-2.0.0-SNAPSHOT-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/jaxb-api.jar"/> + <classpathentry kind="lib" path="lib/jaxb-impl.jar"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar =================================================================== (Binary files differ) Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar =================================================================== (Binary files differ) Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-01 18:12:26 UTC (rev 520) @@ -297,7 +297,7 @@ //} // TODO: Not sure what to do about namespace here? - ((TReply)act).setFaultName(new QName(faultName)); + ((TReply)act).setFaultName(new QName(intf.getNamespace(), faultName)); } if (varName != null) { 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-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELModelUtil.java 2011-01-01 18:12:26 UTC (rev 520) @@ -51,7 +51,8 @@ return(ret); } - public static void serialize(TProcess desc, java.io.OutputStream os) throws IOException { + public static void serialize(TProcess desc, java.io.OutputStream os, + java.util.Map<String, String> prefixes) throws IOException { try { org.savara.bpel.model.ObjectFactory factory= @@ -61,10 +62,51 @@ 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 { + marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", mapper); + } catch (Exception mex) { + mex.printStackTrace(); + } + } + marshaller.marshal(factory.createProcess(desc), os); } catch(Exception e) { throw new IOException("Failed to serialize model", e); } } + static class NamespacePrefixMapperImpl extends com.sun.xml.bind.marshaller.NamespacePrefixMapper { + java.util.Map<String,String> m_prefixes=null; + + public NamespacePrefixMapperImpl(java.util.Map<String,String> prefixes) { + m_prefixes = prefixes; + } + + public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) { + String ret=m_prefixes.get(namespaceUri); + + if (ret == null) { + ret = suggestion; + } + + return(ret); + } + + public String[] getPreDeclaredNamespaceUris() { + String[] ret=new String[m_prefixes.size()]; + int count=0; + + java.util.Iterator<String> iter=m_prefixes.keySet().iterator(); + while (iter.hasNext()) { + ret[count++] = iter.next(); + } + + return(ret); + } + } } Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel.tests ___________________________________________________________________ Name: svn:ignore - .settings .classpath .project + .settings .classpath .project bin Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-01 18:12:26 UTC (rev 520) @@ -22,6 +22,7 @@ import junit.framework.TestResult; import junit.framework.TestSuite; +import org.savara.util.PropertyNames; import org.savara.util.ScribbleServices; import org.savara.bpel.model.TProcess; import org.savara.bpel.util.BPELModelUtil; @@ -58,7 +59,7 @@ return suite; } - public static class ChoreographyToBPELTester extends TestCase { + protected static class ChoreographyToBPELTester extends TestCase { /** * This constructor is initialized with the test @@ -189,10 +190,15 @@ */ if (target instanceof TProcess) { + // Obtain any namespace prefix map + java.util.Map<String, String> prefixes= + (java.util.Map<String, String>) + projected.getProperties().get(PropertyNames.NAMESPACE_PREFIXES); + try { java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - BPELModelUtil.serialize((TProcess)target, baos); + BPELModelUtil.serialize((TProcess)target, baos, prefixes); baos.close(); @@ -261,9 +267,9 @@ } if (f_valid == false) { - String bpelfile="testmodels/"+m_name+".cdm"; + String bpelfile="generator/testmodels/"+m_name+".cdm"; - java.net.URL url=ChoreographyToBPELTester.class.getResource(bpelfile); + java.net.URL url=ClassLoader.getSystemResource(bpelfile); /* try { @@ -279,9 +285,9 @@ java.io.File f=null; if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/plugintest")); + 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/plugintest")); + 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")); } @@ -296,7 +302,7 @@ } java.io.File resultFile=new java.io.File(resultsDir, - m_name+&quot;(a)&quot;+m_role+&quot;.expected&quot;); + m_name+&quot;(a)&quot;+m_role+&quot;.generated&quot;); if (resultFile.exists() == false) { try { @@ -311,7 +317,7 @@ result.addError(this, e); } } else { - System.err.println("NOTE: Expected output '"+resultFile+ + System.err.println("NOTE: Generated output '"+resultFile+ "' already exists - not being overwritten"); } } else { Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-01 18:12:26 UTC (rev 520) @@ -1,32 +1,33 @@ -<process xmlns:bpel="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" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"... - <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="StoreInterface" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/> - <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> - </partnerLinks> - <variables> - <variable messageType="sto:buyRequest" name="buyRequestVar"/> - <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="sto:buyResponse" name="buyResponseVar"/> - <variable messageType="sto:BuyFailedFault" name="BuyFailedFaultVar"/> - </variables> - <sequence> - <receive createInstance="yes" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/> - <scope> - <faultHandlers> - <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar"> - <sequence> - <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="BuyFailedFaultVar"/> - </sequence> - </catch> - </faultHandlers> - <sequence> - <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/> - <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyResponseVar"/> - </sequence> - </scope> - </sequence> -</process> +<?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" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store"> + <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT" myRole="StoreInterface"/> + <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/> + </partnerLinks> + <variables> + <variable name="buyRequestVar" messageType="sto:buyRequest"/> + <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/> + <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/> + <variable name="buyResponseVar" messageType="sto:buyResponse"/> + <variable name="BuyFailedFaultVar" messageType="sto:BuyFailedFault"/> + </variables> + <sequence> + <receive partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyRequestVar" createInstance="yes" name="Receive_BuyRequest"/> + <scope> + <faultHandlers> + <catch faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar" faultMessageType="pur:CreditCheckFailedFault"> + <sequence> + <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="BuyFailedFaultVar" faultName="sto:BuyFailed" name="Send_BuyFailed"/> + </sequence> + </catch> + </faultHandlers> + <sequence> + <invoke partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/> + <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyResponseVar" name="Send_BuyConfirmed"/> + </sequence> + </scope> + </sequence> +</process> Added: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java 2011-01-01 18:12:26 UTC (rev 520) @@ -0,0 +1,26 @@ +/* + * 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.util; + +public class PropertyNames { + + public static final String NAMESPACE_PREFIXES="NamespacePrefixes"; + + public static final String SCHEMA_LOCATIONS="SchemaLocations"; + +} Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-01 18:12:26 UTC (rev 520) @@ -14,6 +14,7 @@ org.savara.contract.model, org.scribble.common, org.scribble.protocol, - org.junit + org.junit, + org.savara.core Export-Package: org.savara.pi4soa.cdm, org.savara.pi4soa.cdm.parser 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-01-01 13:01:33 UTC (rev 519) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-01 18:12:26 UTC (rev 520) @@ -23,14 +23,11 @@ import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.savara.util.PropertyNames; import org.scribble.protocol.model.*; public class ProtocolModelConverterRuleImpl implements ConverterRule { - private static final String SCHEMA_LOCATIONS = "SchemaLocations"; - private static final String NAMESPACES = "Namespaces"; - - /** * This method determines whether the rule can be applied * to the supplied CDL type. @@ -80,8 +77,8 @@ } } - ret.getProperties().put(NAMESPACES, prefixes); - ret.getProperties().put(SCHEMA_LOCATIONS, locations); + ret.getProperties().put(PropertyNames.NAMESPACE_PREFIXES, prefixes); + ret.getProperties().put(PropertyNames.SCHEMA_LOCATIONS, locations); // TODO: Consider how to use the namespace information //ret.setNamespace(getNamespace(cdlpack));