[savara-commits] savara SVN: r63 - in tools/eclipse/trunk/plugins: org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component and 3 other directories.

Author: objectiser Date: 2009-10-19 16:10:54 -0400 (Mon, 19 Oct 2009) New Revision: 63 Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/WSDLGenerator.java Log: Fix namespace issue and remove 'SOAP' from binding suffix. Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-10-17 22:36:19 UTC (rev 62) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2009-10-19 20:10:54 UTC (rev 63) @@ -224,7 +224,8 @@ javax.wsdl.Definition defn=defns.get(i); // Check if definition has a port type - if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0) { + if (defn.getPortTypes().size() > 0 || defn.getMessages().size() > 0 + || defn.getServices().size() > 0) { String filename=getWSDLFileName(role, localcm.getModelName().getName(), i); if (i > 0) { Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2009-10-17 22:36:19 UTC (rev 62) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2009-10-19 20:10:54 UTC (rev 63) @@ -324,7 +324,7 @@ if (attr.getNodeValue().equals(namespace) && attr.getNodeName().startsWith("xmlns:")) { - ret = attr.getNodeName().substring(7); + ret = attr.getNodeName().substring(6); } } } @@ -369,14 +369,14 @@ public String addNamespace(String namespace) { String ret=getPrefix(namespace); int i=1; - + while (ret == null) { - String prefix="ns"+i; + String prefix="ns"+(i++); if (getDOMElement().hasAttribute("xmlns:"+prefix) == false) { ret = prefix; - getDOMElement().setAttribute(prefix, namespace); + getDOMElement().setAttribute("xmlns:"+prefix, namespace); } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java 2009-10-17 22:36:19 UTC (rev 62) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java 2009-10-19 20:10:54 UTC (rev 63) @@ -379,4 +379,46 @@ item(6).getLocalName()); } } + + public void testAddDistinctNamespaces() { + BPELLanguageModel model=new DefaultBPELLanguageModel(null); + + Process component=new Process(model); + + String prefix1=component.addNamespace("namespace1"); + String prefix2=component.addNamespace("namespace2"); + + if (prefix1 == null) { + fail("First prefix is null"); + } + + if (prefix2 == null) { + fail("Second prefix is null"); + } + + if (prefix1.equals(prefix2)) { + fail("Prefixes should be different: "+prefix1+" "+prefix2); + } + } + + public void testAddSameNamespaces() { + BPELLanguageModel model=new DefaultBPELLanguageModel(null); + + Process component=new Process(model); + + String prefix1=component.addNamespace("namespace1"); + String prefix2=component.addNamespace("namespace1"); + + if (prefix1 == null) { + fail("First prefix is null"); + } + + if (prefix2 == null) { + fail("Second prefix is null"); + } + + if (prefix1.equals(prefix2) == false) { + fail("Prefixes should be same: "+prefix1+" "+prefix2); + } + } } Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/WSDLGenerator.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/WSDLGenerator.java 2009-10-17 22:36:19 UTC (rev 62) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/WSDLGenerator.java 2009-10-19 20:10:54 UTC (rev 63) @@ -30,7 +30,8 @@ */ public class WSDLGenerator { - public static final String SOAP_BINDING_SUFFIX = "SOAPBinding"; + public static final String BINDING_SUFFIX = "Binding"; + private static Log logger = LogFactory.getLog(WSDLGenerator.class); public WSDLGenerator() { @@ -236,7 +237,7 @@ if (intf.getName() != null) { ret.setQName(new javax.xml.namespace.QName(intf.getNamespace(), - intf.getName()+SOAP_BINDING_SUFFIX)); + intf.getName()+BINDING_SUFFIX)); } ret.setPortType(portType); Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java =================================================================== --- tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2009-10-17 22:36:19 UTC (rev 62) +++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.wsdl.tests/src/java/org/jboss/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2009-10-19 20:10:54 UTC (rev 63) @@ -139,7 +139,7 @@ fail("QName localpart not set"); } - if (result.getQName().getLocalPart().equals(TEST_NAME+WSDLGenerator.SOAP_BINDING_SUFFIX) == false) { + if (result.getQName().getLocalPart().equals(TEST_NAME+WSDLGenerator.BINDING_SUFFIX) == false) { fail("QName localpart not correct: "+result.getQName().getLocalPart()); } }