From 24e45a6f5fd47b94646276534f0377f1399ab3bb Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 9 Oct 2009 08:49:49 +0000 Subject: TUSCANY-3283 generate unannotated beans into the namespace of the WSDL rather than an empty namespace git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@823459 13f79535-47bb-0310-9956-ffa450edef68 --- .../wsdlgen/src/main/java/helloworld/ABean.java | 13 + .../main/java/helloworld/HelloWorldClientImpl.java | 68 ++++ .../src/main/java/helloworld/HelloWorldImpl.java | 39 ++- .../main/java/helloworld/HelloWorldService.java | 11 +- .../src/main/resources/helloworld1.composite | 43 +++ .../wsdl/HelloWorldService_TuscanyGen.wsdl | 343 +++++++++++++++++++++ .../src/main/resources/wsdl/helloworld.wsdl | 210 ------------- .../java/helloworld/HttpTransportTestCase.java | 122 ++++++++ .../ws/wsdlgen/Interface2WSDLGenerator.java | 311 +++++++++++++++++-- .../sca/interfacedef/wsdl/WSDLDefinition.java | 8 + .../interfacedef/wsdl/impl/WSDLDefinitionImpl.java | 10 + 11 files changed, 930 insertions(+), 248 deletions(-) create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl delete mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl create mode 100644 branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java index 8a99a81132..bcfa0f8be7 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/ABean.java @@ -18,10 +18,15 @@ */ package helloworld; +import anotherpackage.BBean; + + + public class ABean { protected String field1; protected String field2; + protected BBean field3; public String getField1() { return field1; @@ -38,5 +43,13 @@ public class ABean { public void setField2(String field2) { this.field2 = field2; } + + public BBean getField3() { + return field3; + } + + public void setField3(BBean field3) { + this.field3 = field3; + } } diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java new file mode 100644 index 0000000000..04fbe6934a --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldClientImpl.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import yetanotherpackage.DBean; + +import anotherpackage.BBean; +import anotherpackage.CBean; + +/** + * This class implements the HelloWorld service. + */ +@Service(HelloWorldService.class) +public class HelloWorldClientImpl implements HelloWorldService { + + @Reference + protected HelloWorldService hwService; + + public String getGreetings(String name) { + return "Hello " + hwService.getGreetings(name); + } + + public String getGreetingsBean(ABean bean){ + return "Hello " + hwService.getGreetingsBean(bean); + } + + public String getGreetingsBeanArray(ABean[] bean){ + return "Hello " + hwService.getGreetingsBeanArray(bean); + } + + /* + public String getGreetingsBeanVector(Vector bean){ + return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2(); + } + */ + + public String getGreetingsBBean(BBean bean){ + return "Hello " + hwService.getGreetingsBBean(bean); + } + + public String getGreetingsCBean(CBean bean){ + return "Hello " + hwService.getGreetingsCBean(bean); + } + + public String getGreetingsDBean(DBean bean){ + return "Hello " + hwService.getGreetingsDBean(bean); + } +} diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java index 83165307af..a92a819aaf 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldImpl.java @@ -18,31 +18,52 @@ */ package helloworld; -import java.util.Vector; +import javax.jws.WebService; import org.osoa.sca.annotations.Service; +import yetanotherpackage.DBean; + +import anotherpackage.BBean; +import anotherpackage.CBean; + /** * This class implements the HelloWorld service. */ +@WebService @Service(HelloWorldService.class) public class HelloWorldImpl implements HelloWorldService { public String getGreetings(String name) { return "Hello " + name; } - - public String getGreetingsBean(ABean bean){ - return "Hello " + bean.getField1() + " " + bean.getField2(); + + public String getGreetingsBean(ABean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2() + + bean.getField3().getField1() + " " + + bean.getField3().getField2(); } - public String getGreetingsBeanArray(ABean[] bean){ + public String getGreetingsBeanArray(ABean[] bean) { return "Hello " + bean[0].getField1() + " " + bean[0].getField2(); } - + /* - public String getGreetingsBeanVector(Vector bean){ - return "Hello " + bean.get(0).getField1() + " " + bean.get(0).getField2(); + * public String getGreetingsBeanVector(Vector bean){ return "Hello " + * + bean.get(0).getField1() + " " + bean.get(0).getField2(); } + */ + + public String getGreetingsBBean(BBean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2(); + } + + public String getGreetingsCBean(CBean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2(); } - */ + + public String getGreetingsDBean(DBean bean) { + return "Hello " + bean.getField1() + " " + bean.getField2() + " " + + bean.getField3().getField1() + " " + + bean.getField3().getField2(); + } } diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java index 6f3d57e6f7..6b0425d473 100644 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/java/helloworld/HelloWorldService.java @@ -18,13 +18,19 @@ */ package helloworld; -import java.util.Vector; +import javax.jws.WebService; import org.osoa.sca.annotations.Remotable; +import yetanotherpackage.DBean; + +import anotherpackage.BBean; +import anotherpackage.CBean; + /** * This is the business interface of the HelloWorld greetings service. */ +@WebService @Remotable public interface HelloWorldService { @@ -32,5 +38,8 @@ public interface HelloWorldService { public String getGreetingsBean(ABean bean); public String getGreetingsBeanArray(ABean[] bean); //public String getGreetingsBeanVector(Vector bean); + public String getGreetingsBBean(BBean bean); + public String getGreetingsCBean(CBean bean); + public String getGreetingsDBean(DBean bean); } diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite new file mode 100644 index 0000000000..12d98d3453 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/helloworld1.composite @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl new file mode 100644 index 0000000000..6c6d8c6637 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/HelloWorldService_TuscanyGen.wsdl @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl deleted file mode 100644 index c76ed7b338..0000000000 --- a/branches/sca-java-1.5.2/itest/wsdlgen/src/main/resources/wsdl/helloworld.wsdl +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java new file mode 100644 index 0000000000..22f154fbf3 --- /dev/null +++ b/branches/sca-java-1.5.2/itest/wsdlgen/src/test/java/helloworld/HttpTransportTestCase.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package helloworld; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import yetanotherpackage.DBean; + +import anotherpackage.BBean; + +/** + * Tests that the helloworld server is available + */ +public class HttpTransportTestCase{ + + private SCADomain scaDomain; + + @Before + public void startServer() throws Exception { + scaDomain = SCADomain.newInstance("helloworld1.composite"); + } + + @Ignore + @Test + public void testWaitForInput() { + System.out.println("Press a key to end"); + try { + System.in.read(); + } catch (Exception ex) { + } + System.out.println("Shutting down"); + } + + @Test + public void testComponent1SCA() throws IOException { + HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent1/HelloWorldService"); + assertNotNull(helloWorldService); + + HelloWorldService helloWorldClient = scaDomain.getService(HelloWorldService.class, "HelloWorldClientComponent1/HelloWorldService"); + assertNotNull(helloWorldClient); + + assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); + assertEquals("Hello Hello Smith", helloWorldClient.getGreetings("Smith")); + + BBean bbean = new BBean(); + bbean.setField1("1"); + bbean.setField2("2"); + + DBean abean = new DBean(); + abean.setField1("3"); + abean.setField2("4"); + abean.setField3(bbean); + + assertEquals("Hello Hello 3 4 1 2", helloWorldClient.getGreetingsDBean(abean)); + } + + @Test + public void testComponent1JAXWS() throws IOException { + + // talk to the service using JAXWS with WSDL generated from this service used wsgen + // the idea here is to demonstrate that the service is providing a JAXWS compliant + // interface + QName serviceName = new QName("http://helloworld/", "HelloWorldImplService"); + URL wsdlLocation = this.getClass().getClassLoader().getResource("wsdl/HelloWorldImplService.wsdl"); + Service webService = Service.create( wsdlLocation, serviceName ); + HelloWorldService wsProxy = (HelloWorldService) webService.getPort(HelloWorldService.class); + + assertEquals("Hello Fred", wsProxy.getGreetings("Fred")); + + BBean bbean = new BBean(); + bbean.setField1("1"); + bbean.setField2("2"); + + DBean abean = new DBean(); + abean.setField1("3"); + abean.setField2("4"); + abean.setField3(bbean); + + assertEquals("Hello 3 4 1 2", wsProxy.getGreetingsDBean(abean)); + + // repeat the JAXWS call with WSDL generated by tuscany + + } + + @After + public void stopServer() throws Exception { + if (scaDomain != null) { + scaDomain.close(); + } + } + +} diff --git a/branches/sca-java-1.5.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/branches/sca-java-1.5.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java index 4c63122eff..34b7ed7bef 100644 --- a/branches/sca-java-1.5.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java +++ b/branches/sca-java-1.5.2/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.binding.ws.wsdlgen; import java.lang.reflect.Method; import java.net.URI; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -47,6 +48,12 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.databinding.DataBinding; @@ -72,10 +79,13 @@ import org.apache.tuscany.sca.monitor.Problem.Severity; import org.apache.tuscany.sca.monitor.impl.ProblemImpl; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; +import org.apache.tuscany.sca.xsd.impl.XSDefinitionImpl; import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaException; import org.apache.ws.commons.schema.utils.NamespaceMap; +import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -330,7 +340,7 @@ public class Interface2WSDLGenerator { binding.setUndefined(false); definition.addBinding(binding); wsdlDefinition.setBinding(binding); - + // call each helper in turn to populate the wsdl.types element XmlSchemaCollection schemaCollection = new XmlSchemaCollection(); @@ -340,12 +350,14 @@ public class Interface2WSDLGenerator { continue; } List xsDefinitions = helper.getSchemaDefinitions(xsdFactory, resolver, en.getValue()); + for (XSDefinition xsDef: xsDefinitions) { - // TUSCANY-2757 and TUSCANY-3267 - flip global wrapper elements with nillable - // set true to be set to false. The JAXB RI seems to be generating this setting - // incorrectly according to the JAXB spec. + Document doc = xsDef.getDocument(); - if (doc != null) { + if (doc != null) { + // TUSCANY-2757 and TUSCANY-3267 - flip global wrapper elements with nillable + // set true to be set to false. The JAXB RI seems to be generating this setting + // incorrectly according to the JAXB spec. NodeList nodes = doc.getFirstChild().getChildNodes(); for (int i = 0; i < nodes.getLength(); i++) { Node aNode = nodes.item(i); @@ -364,7 +376,9 @@ public class Interface2WSDLGenerator { } } } - addSchemaExtension(xsDef, schemaCollection, wsdlDefinition, definition); + + loadXSD(schemaCollection, xsDef); + wsdlDefinition.getXmlSchemas().add(xsDef); } } @@ -374,6 +388,8 @@ public class Interface2WSDLGenerator { wrappers.remove(wrapperName); } } + + schemaCollection = new XmlSchemaCollection(); // generate schema elements for wrappers that aren't defined in the schemas if (wrappers.size() > 0) { @@ -390,25 +406,41 @@ public class Interface2WSDLGenerator { schemaDoc = xsDef.getDocument(); schema = schemaDoc.getDocumentElement(); } else { - schemaDoc = createDocument(); - schema = schemaDoc.createElementNS(SCHEMA_NS, "xs:schema"); - // The elementFormDefault should be set to unqualified, see TUSCANY-2388 - schema.setAttribute("elementFormDefault", "unqualified"); - schema.setAttribute("attributeFormDefault", "qualified"); - schema.setAttribute("targetNamespace", targetNS); - schema.setAttributeNS(XMLNS_NS, "xmlns:xs", SCHEMA_NS); - schemaDoc.appendChild(schema); - Schema schemaExt = createSchemaExt(definition); - schemaExt.setElement(schema); - prefixMaps.put(schema, new HashMap()); - xsDef = xsdFactory.createXSDefinition(); - xsDef.setUnresolved(true); - xsDef.setNamespace(targetNS); - xsDef.setDocument(schemaDoc); - // TUSCANY-2465: Set the system id to avoid schema conflict - xsDef.setLocation(URI.create("xsd_" + index + ".xsd")); - index++; - wrapperXSDs.put(targetNS, xsDef); + xsDef = wsdlDefinition.getSchema(targetNS); + if (xsDef != null) { + schemaDoc = xsDef.getDocument(); + schema = schemaDoc.getDocumentElement(); + wrapperXSDs.put(targetNS, xsDef); + Map prefixMap = prefixMaps.get(schema); + if (prefixMap == null){ + prefixMap = new HashMap(); + prefixMaps.put(schema, prefixMap); + String [] prefixes = xsDef.getSchema().getNamespaceContext().getDeclaredPrefixes(); + for (int j = 0; j < prefixes.length; j++){ + prefixMap.put(xsDef.getSchema().getNamespaceContext().getNamespaceURI(prefixes[j]), + prefixes[j]); + } + } + } else { + schemaDoc = createDocument(); + schema = schemaDoc.createElementNS(SCHEMA_NS, "xs:schema"); + // The elementFormDefault should be set to unqualified, see TUSCANY-2388 + schema.setAttribute("elementFormDefault", "unqualified"); + schema.setAttribute("attributeFormDefault", "qualified"); + schema.setAttribute("targetNamespace", targetNS); + schema.setAttributeNS(XMLNS_NS, "xmlns:xs", SCHEMA_NS); + schema.setAttributeNS(XMLNS_NS, "xmlns:tns", targetNS); + schemaDoc.appendChild(schema); + prefixMaps.put(schema, new HashMap()); + xsDef = xsdFactory.createXSDefinition(); + xsDef.setUnresolved(true); + xsDef.setNamespace(targetNS); + xsDef.setDocument(schemaDoc); + // TUSCANY-2465: Set the system id to avoid schema conflict + xsDef.setLocation(URI.create("xsd_" + index + ".xsd")); + index++; + wrapperXSDs.put(targetNS, xsDef); + } } Element wrapper = schemaDoc.createElementNS(SCHEMA_NS, "xs:element"); schema.appendChild(wrapper); @@ -429,6 +461,9 @@ public class Interface2WSDLGenerator { String prefix = prefixMap.get(nsURI); if (prefix == null) { prefix = "ns" + i++; + while(prefixMap.containsValue(prefix)){ + prefix = "ns" + i++; + } prefixMap.put(nsURI, prefix); schema.setAttributeNS(XMLNS_NS, "xmlns:" + prefix, nsURI); addSchemaImport(schema, nsURI, schemaDoc); @@ -467,6 +502,9 @@ public class Interface2WSDLGenerator { prefix = "tns"; } else { prefix = "ns" + i++; + while(prefixMap.containsValue(prefix)){ + prefix = "ns" + i++; + } addSchemaImport(schema, nsURI, schemaDoc); } prefixMap.put(nsURI, prefix); @@ -482,14 +520,231 @@ public class Interface2WSDLGenerator { // resolve XSDefinitions containing generated wrappers for (XSDefinition xsDef: wrapperXSDs.values()) { + if (wsdlDefinition.getSchema(xsDef.getNamespace()) == null) { + wsdlDefinition.getXmlSchemas().add(xsDef); + } + + xsDef.setSchema(null); + xsDef.setSchemaCollection(null); loadXSD(schemaCollection, xsDef); - wsdlDefinition.getXmlSchemas().add(xsDef); } } + + XSDefinition noNamespaceSchema = null; + XSDefinition defaultNamespaceSchema = null; + for (XSDefinition xsDef: wsdlDefinition.getXmlSchemas()) { + // only apply these changes if we have a DOM to work with + // this will generally come from the JAXB generation. SDO + // just goes straight to generating XmlSchema structures + Document doc = xsDef.getDocument(); + if (doc != null) { + // TUSCANY-3283 find any schema that has been generated without a namespace + // and any schema using the default WSDL schema so that we can + // merge the two together + if (xsDef.getNamespace().equals("")){ + noNamespaceSchema = xsDef; + } + if (xsDef.getNamespace().equals(namespaceURI)){ + defaultNamespaceSchema = xsDef; + } + } + } + + // TUSCANY-3283 merge the no namespace schema into the default namespace schema + if (noNamespaceSchema != null && defaultNamespaceSchema != null){ + // remove the no namespace schema from our list of schema + wsdlDefinition.getXmlSchemas().remove(noNamespaceSchema); + // merge the schema with no namespace into the schema with the default namspace for this WSDL + mergeSchema(noNamespaceSchema, defaultNamespaceSchema, wsdlDefinition.getXmlSchemas()); + + schemaCollection = new XmlSchemaCollection(); + defaultNamespaceSchema.setSchema(null); + defaultNamespaceSchema.setSchemaCollection(null); + loadXSD(schemaCollection, defaultNamespaceSchema); + } + + // push the schema into the WSDL + for (XSDefinition xsDef: wsdlDefinition.getXmlSchemas()){ + addSchemaExtension(xsDef, schemaCollection, wsdlDefinition, definition); + } + + // useful for debugging DOM issues + //System.out.println("======================= Schema DOM =======================" ); + //for (XSDefinition xsDef : wsdlDefinition.getXmlSchemas()) { + // if (xsDef.getDocument() != null) { + // printDOM(xsDef.getDocument()); + // } + //} + return definition; + } + + /** + * TUSCANY-3283 + * Merge the no namespace schema into the defualt namespace schema + * Relies on being called just after the getSchemaDefinitions call when the XSDefinitions + * have only the DOM information set + * + * @param noNamespaceSchema + * @param defaultNamespaceSchema + * @param xsDefinitions + */ + private void mergeSchema(XSDefinition noNamespaceSchema, XSDefinition defaultNamespaceSchema, Collection xsDefinitions){ + Document fromDoc = noNamespaceSchema.getDocument(); + Document toDoc = defaultNamespaceSchema.getDocument(); + + // merge namespace definitions from the nonamespace schema into the default namespace schema + for(int i = 0; i < fromDoc.getDocumentElement().getAttributes().getLength(); i++){ + Attr attribute = (Attr)fromDoc.getDocumentElement().getAttributes().item(i); + String attribName = attribute.getName(); + if (attribName.startsWith("xmlns:")){ + + String fromPrefix = attribName.substring(attribName.indexOf(":") + 1); + + if (fromPrefix.equals("xs") != true){ + // create a new namespace prefix to prevent clashes + toDoc.getDocumentElement().setAttributeNS("http://www.w3.org/2000/xmlns/", + "xmlns:__" + fromPrefix, + attribute.getValue()); + + // fix up any references to the existing namespace prefix + fixUpNoNamespaceNamespaces(fromDoc, fromPrefix); + } + } + } + + Node toDocFirstChild = toDoc.getDocumentElement().getFirstChild(); + + // merge types from the no namespace schema into the default namespace schema + for(int i = 0; i < fromDoc.getDocumentElement().getChildNodes().getLength(); i++){ + // merge the DOM types + Node node = fromDoc.getDocumentElement().getChildNodes().item(i); + Node newNode = toDoc.importNode(node, true); + + if (newNode.getLocalName() != null && + (newNode.getLocalName().equals("import") || + newNode.getLocalName().equals("include") || + newNode.getLocalName().equals("redefine") || + newNode.getLocalName().equals("annotation") )){ + toDoc.getDocumentElement().insertBefore(newNode, toDocFirstChild); + } else { + toDoc.getDocumentElement().appendChild(newNode); + } + } + + // fix up any references to the types we've just moved + for(int i = 0; i < fromDoc.getDocumentElement().getChildNodes().getLength(); i++){ + Node node = fromDoc.getDocumentElement().getChildNodes().item(i); + + // correct any references to no name types in other schema + if (node.getLocalName() != null && + node.getLocalName().equals("complexType")){ + Node typeName = node.getAttributes().getNamedItem("name"); + fixUpNoNamespaceReferences(xsDefinitions, typeName.getNodeValue(), defaultNamespaceSchema.getNamespace()); + } + } + } + + /** + * TUSCANY-3283 + * Correct any namespace prefixes in the no namespace schema to prevent them from + * clashing when the no namespace schema is merged with the default schema + * + * @param fromSchema + * @param fromPrefix + * @param toPrefix + */ + private void fixUpNoNamespaceNamespaces(Document fromSchema, String fromPrefix){ + NodeList elements = fromSchema.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","element"); + for (int k = 0; k < elements.getLength(); k++){ + Element element = (Element) elements.item(k); + if (element != null && element.getAttributes() != null) { + Node type = element.getAttributes().getNamedItem("type"); + + if (type != null && + type.getNodeValue().startsWith(fromPrefix)){ + type.setNodeValue("__" + type.getNodeValue()); + } + } + } } + /** + * TUSCANY-3283 + * Correct any references in the schema list that used to point to types in the + * no namespace schema + * + * @param fromSchema + * @param toSchema + */ + private void fixUpNoNamespaceReferences(Collection xsDefinitions, String typeName, String defaultNamespace){ + + // fix up any references in any other schema that points to this type + for (XSDefinition xsDef: xsDefinitions) { + + if (xsDef.getDocument() != null){ + // look for any imports of the no namespace schema + Document refSchema = xsDef.getDocument(); + NodeList imports = refSchema.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","import"); + + for (int j = 0; j < imports.getLength(); j++){ + Element _import = (Element)imports.item(j); + + // Fix up the import + if (_import.getAttributes().getLength() == 0){ + if (xsDef.getNamespace().equals(defaultNamespace)){ + // remove the import + _import.getParentNode().removeChild(_import); + } else { + // update the import to refer to the default namespace + _import.setAttribute("namespace", defaultNamespace); + } + } + } + + // look for any type attributes that refer to the + // node being merged + NodeList elements = refSchema.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema","element"); + for (int k = 0; k < elements.getLength(); k++){ + Element element = (Element) elements.item(k); + if (element != null && element.getAttributes() != null) { + Node type = element.getAttributes().getNamedItem("type"); + + if (type != null && + type.getNodeValue().equals(typeName)){ + if (xsDef.getNamespace().equals(defaultNamespace)){ + // just add "tns" in front of the type name as + // we have merged the type into this schema + type.setNodeValue("tns:" + type.getNodeValue()); + } else { + // add a namespace + refSchema.getDocumentElement().setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:__nnns", defaultNamespace); + + // prefix the type name with the namespace + type.setNodeValue("__nnns:" + type.getNodeValue()); + } + } + } + } + } + } + } + + /* + * Just used when debugging DOM problems + */ + private void printDOM(Document document){ + try { + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + Source source = new DOMSource(document); + Result result = new StreamResult(System.out); + transformer.transform(source, result); + } catch (Exception ex){ + ex.toString(); + } + } + private static void addSchemaImport(Element schema, String nsURI, Document schemaDoc) { Element imp = schemaDoc.createElementNS(SCHEMA_NS, "xs:import"); if (!"".equals(nsURI)) { @@ -548,8 +803,8 @@ public class Interface2WSDLGenerator { throw new RuntimeException(e); } } - loadXSD(schemaCollection, xsDef); - wsdlDefinition.getXmlSchemas().add(xsDef); + //loadXSD(schemaCollection, xsDef); + //wsdlDefinition.getXmlSchemas().add(xsDef); Element schema = document.getDocumentElement(); Schema schemaExt = createSchemaExt(definition); schemaExt.setDocumentBaseURI(document.getDocumentURI()); diff --git a/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java index 039e75f437..60f8647960 100644 --- a/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java +++ b/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java @@ -137,4 +137,12 @@ public interface WSDLDefinition extends Base { * @param binding the WSDL binding */ void setBinding(Binding binding); + + /** + * Find the schema definition for the provided namespace + * + * @param namespace + * @return the schema definition relating to the provided namespace or null if not found + */ + XSDefinition getSchema(String namespace); } diff --git a/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java index 16e9cf43f3..7dd6b28665 100644 --- a/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java +++ b/branches/sca-java-1.5.2/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java @@ -285,5 +285,15 @@ public class WSDLDefinitionImpl implements WSDLDefinition { public void setBinding(Binding binding) { this.binding = binding; } + + public XSDefinition getSchema(String namespace){ + for (XSDefinition xsDef : schemas){ + if (xsDef.getNamespace().equals(namespace)){ + return xsDef; + } + } + + return null; + } } -- cgit v1.2.3