From ecfc25c5a329a3e7528d8aff7279adfd68965806 Mon Sep 17 00:00:00 2001 From: nash Date: Mon, 15 Sep 2008 14:49:05 +0000 Subject: Fix TUSCANY-2531 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695485 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'branches/sca-java-1.3.2/modules/binding-ws-wsdlgen') diff --git a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index b8f5b356dd..0fa8773c65 100644 --- a/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-java-1.3.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -352,18 +352,20 @@ public class Interface2WSDLGenerator { if ("".equals(nsURI)) { xsElement.setAttribute("type", typeName.getLocalPart()); addSchemaImport(schema, "", schemaDoc); - } else if (targetNS.equals(nsURI)) { - xsElement.setAttribute("type", typeName.getLocalPart()); } else if (SCHEMA_NS.equals(nsURI)) { xsElement.setAttribute("type", "xs:" + typeName.getLocalPart()); } else { Map prefixMap = prefixMaps.get(schema); String prefix = prefixMap.get(nsURI); if (prefix == null) { - prefix = "ns" + i++; + if (targetNS.equals(nsURI)) { + prefix = "tns"; + } else { + prefix = "ns" + i++; + addSchemaImport(schema, nsURI, schemaDoc); + } prefixMap.put(nsURI, prefix); schema.setAttributeNS(XMLNS_NS, "xmlns:" + prefix, nsURI); - addSchemaImport(schema, nsURI, schemaDoc); } xsElement.setAttribute("type", prefix + ":" + typeName.getLocalPart()); } -- cgit v1.2.3