From a7c1a39d8c3c4ef4d5878dbff726085082a17e8a Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:31 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835136 13f79535-47bb-0310-9956-ffa450edef68 --- .../wsdl/xml/BPELExtensionHandler.java | 141 ++++++ .../sca/interfacedef/wsdl/xml/WSDLConstants.java | 38 ++ .../wsdl/xml/WSDLDocumentProcessor.java | 233 ++++++++++ .../wsdl/xml/WSDLInterfaceProcessor.java | 284 ++++++++++++ .../interfacedef/wsdl/xml/WSDLModelResolver.java | 512 +++++++++++++++++++++ 5 files changed, 1208 insertions(+) create mode 100644 sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java create mode 100644 sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java create mode 100644 sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java create mode 100644 sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java create mode 100644 sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (limited to 'sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml') diff --git a/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java new file mode 100644 index 0000000000..5178149b63 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java @@ -0,0 +1,141 @@ +/* + * 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 org.apache.tuscany.sca.interfacedef.wsdl.xml; + +import java.io.PrintWriter; + +import javax.wsdl.Definition; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.ExtensionDeserializer; +import javax.wsdl.extensions.ExtensionRegistry; +import javax.wsdl.extensions.ExtensionSerializer; +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.interfacedef.wsdl.BPELPartnerLinkTypeExt; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +/** + * A WSDL extension processor for extension elements introduced by BPEL - in particular + * the elements + * + * @version $Rev$ $Date$ + */ +public class BPELExtensionHandler implements ExtensionSerializer, ExtensionDeserializer { + + private final String localName = "partnerLinkType"; + private final String roleName = "role"; + + /** + * Marshals the BPEL partner link type extension element to XML + * See (@link javax.wsdl.extensions.ExtensionSerializer) + */ + @SuppressWarnings("unchecked") + public void marshall(Class parentType, QName elementType, ExtensibilityElement theElement, + PrintWriter writer, Definition def, ExtensionRegistry extReg) + throws WSDLException { + // The format of the Partner Link Type in XML is as follows: + // + // + // + // + BPELPartnerLinkTypeExt thePLinkType = (BPELPartnerLinkTypeExt) theElement; + QName theType = thePLinkType.getElementType(); + + writer.println("<" + theType.toString() + + " name=\"" + thePLinkType.getName() + "\">"); + for( int i = 0; i < 2; i++ ) { + if( thePLinkType.getRoleName( i ) != null ) { + writer.println( "<" + theType.getPrefix() + ":role" + + " name=\"" + thePLinkType.getRoleName(i) + "\" portType=\"" + + thePLinkType.getRolePortType(i) + "\">"); + } // end if + } // end for + writer.println(""); + } // end marshall + + /** + * Unmarshals the BPEL partner link type element from XML + * See (@link javax.wsdl.extensions.ExtensionDeserializer) + * The format of the Partner Link Type in XML is as follows: + * + * + * + * + * + * One role is mandatory, the second is optional. + */ + @SuppressWarnings("unchecked") + public ExtensibilityElement unmarshall(Class theClass, QName elementType, + Element theElement, Definition def, ExtensionRegistry extReg) + throws WSDLException { + + // Check that this elementType really is a partnerLinkType element + if( !elementType.getLocalPart().equals(localName) ) return null; + BPELPartnerLinkTypeExt theExtension = new BPELPartnerLinkTypeExt(); + theExtension.setElementType(elementType); + theExtension.setName( theElement.getAttribute("name") ); + + // Fetch the child "role" elements + NodeList theRoles = theElement.getElementsByTagNameNS("*", roleName); + for ( int i=0; i < theRoles.getLength(); i++ ) { + if( i > 1 ) break; + Element roleNode = (Element)theRoles.item(i); + String roleName = roleNode.getAttribute("name"); + String portType = roleNode.getAttribute("portType"); + if (portType == null || portType.length() == 0) { + // Fetch the child "portType" element + NodeList portTypesNodes = roleNode.getElementsByTagNameNS("*", "portType"); + for (int p = 0; p < portTypesNodes.getLength(); p++) { + Element portTypeNode = (Element)portTypesNodes.item(p); + portType = portTypeNode.getAttribute("name"); + break; + } + } + // The PortType attribute is a QName in prefix:localName format - convert to a QName + QName rolePortType = getQNameValue( def, portType ); + theExtension.setRole( i, roleName, rolePortType ); + } // end for + return theExtension; + } // end unmarshall + + + /** + * Returns a QName from a string. + * @param definition - a WSDL Definition + * @param value - the String from which to form the QName in the form "pref:localName" + * @return + */ + protected QName getQNameValue(Definition definition, String value) { + if (value != null && definition != null) { + int index = value.indexOf(':'); + String prefix = index == -1 ? "" : value.substring(0, index); + String localName = index == -1 ? value : value.substring(index + 1); + String ns = definition.getNamespace(prefix); + if (ns == null) { + ns = ""; + } + return new QName(ns, localName, prefix); + } else { + return null; + } + } // end getQNameValue + +} // end BPELExtensionHandler diff --git a/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java new file mode 100644 index 0000000000..7d48dc62bd --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java @@ -0,0 +1,38 @@ +/* + * 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 org.apache.tuscany.sca.interfacedef.wsdl.xml; + +import javax.xml.namespace.QName; + +/** + * Constants for WSDL. + * + * @version $Rev: 750765 $ $Date: 2009-03-06 04:36:04 +0000 (Fri, 06 Mar 2009) $ + */ +public interface WSDLConstants { + String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200903"; + String INTERFACE_WSDL = "interface.wsdl"; + QName INTERFACE_WSDL_QNAME = new QName(SCA11_NS, "interface.wsdl"); + String INTERFACE = "interface"; + String CALLBACK_INTERFACE = "callbackInterface"; + String WSDL_LOCATION = "wsdlLocation"; + String WSDLI_NS = "http://www.w3.org/2004/08/wsdl-instance"; + QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); + +} diff --git a/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java new file mode 100644 index 0000000000..c169214e44 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java @@ -0,0 +1,233 @@ +/* + * 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 org.apache.tuscany.sca.interfacedef.wsdl.xml; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; + +import javax.wsdl.Definition; +import javax.wsdl.Import; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; +import org.apache.tuscany.sca.xsd.XSDFactory; +import org.apache.tuscany.sca.xsd.XSDefinition; + +/** + * An ArtifactProcessor for WSDL documents. + * + * @version $Rev: 709339 $ $Date: 2008-10-31 04:01:44 +0000 (Fri, 31 Oct 2008) $ + */ +public class WSDLDocumentProcessor implements URLArtifactProcessor { + + public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions"); + public static final QName WSDL11_IMPORT = new QName("http://schemas.xmlsoap.org/wsdl/", "import"); + public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); + + private XMLInputFactory inputFactory; + + private WSDLFactory factory; + private XSDFactory xsdFactory; + private Monitor monitor; + + public WSDLDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) { + this.factory = modelFactories.getFactory(WSDLFactory.class); + this.xsdFactory = modelFactories.getFactory(XSDFactory.class); + this.inputFactory = modelFactories.getFactory(XMLInputFactory.class); + this.monitor = monitor; + } + + /** + * Report a exception. + * + * @param problems + * @param message + * @param model + */ + private void error(String message, Object model, Exception ex) { + if (monitor != null) { + Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex); + monitor.problem(problem); + } + } + + public WSDLDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + try { + WSDLDefinition definition = indexRead(artifactURL); + definition.setURI(artifactURI); + return definition; + } catch (Exception e) { + ContributionReadException ce = new ContributionReadException(e); + error("ContributionReadException", artifactURL, ce); + //throw ce; + return null; + } + } + + public void resolve(WSDLDefinition model, ModelResolver resolver) throws ContributionResolveException { + if (model == null) return; + + Definition definition = model.getDefinition(); + if (definition != null) { + for (Object imports : definition.getImports().values()) { + List importList = (List)imports; + for (Object i : importList) { + Import imp = (Import)i; + if (imp.getDefinition() != null) { + continue; + } + if (imp.getLocationURI() == null) { + // FIXME: [rfeng] By the WSDL 1.1 Specification, the location attribute is required + // We need to resolve it by QName + WSDLDefinition proxy = factory.createWSDLDefinition(); + proxy.setUnresolved(true); + proxy.setNamespace(imp.getNamespaceURI()); + WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, proxy); + if (resolved != null && !resolved.isUnresolved()) { + imp.setDefinition(resolved.getDefinition()); + if (!model.getImportedDefinitions().contains(resolved)) { + model.getImportedDefinitions().add(resolved); + } + } + } else { + String location = imp.getLocationURI(); + if (location.indexOf(' ') != -1) { + location = location.replace(" ", "%20"); + } + URI uri = URI.create(location); + if (uri.isAbsolute()) { + WSDLDefinition resolved; + try { + resolved = read(null, uri, uri.toURL()); + imp.setDefinition(resolved.getDefinition()); + if (!model.getImportedDefinitions().contains(resolved)) { + model.getImportedDefinitions().add(resolved); + } + } catch (Exception e) { + ContributionResolveException ce = new ContributionResolveException(e); + error("ContributionResolveException", resolver, ce); + //throw ce; + } + } else { + if (location.startsWith("/")) { + // This is a relative URI against a contribution + location = location.substring(1); + // TODO: Need to resolve it against the contribution + } else { + // This is a relative URI against the WSDL document + URI baseURI = URI.create(model.getDefinition().getDocumentBaseURI()); + URI locationURI = baseURI.resolve(location); + WSDLDefinition resolved; + try { + resolved = read(null, locationURI, locationURI.toURL()); + imp.setDefinition(resolved.getDefinition()); + if (!model.getImportedDefinitions().contains(resolved)) { + model.getImportedDefinitions().add(resolved); + } + } catch (Exception e) { + ContributionResolveException ce = new ContributionResolveException(e); + error("ContributionResolveException", resolver, ce); + //throw ce; + } + } + } + } + } + } + } + } + + public String getArtifactType() { + return ".wsdl"; + } + + public Class getModelType() { + return WSDLDefinition.class; + } + + /** + * Read the namespace for the WSDL definition and inline schemas + * + * @param doc + * @return + * @throws IOException + * @throws XMLStreamException + */ + protected WSDLDefinition indexRead(URL doc) throws Exception { + WSDLDefinition wsdlDefinition = factory.createWSDLDefinition(); + wsdlDefinition.setUnresolved(true); + wsdlDefinition.setLocation(doc.toURI()); + + InputStream is = doc.openStream(); + try { + XMLStreamReader reader = inputFactory.createXMLStreamReader(is); + int eventType = reader.getEventType(); + int index = 0; + while (true) { + if (eventType == XMLStreamConstants.START_ELEMENT) { + if (WSDL11.equals(reader.getName())) { + String tns = reader.getAttributeValue(null, "targetNamespace"); + wsdlDefinition.setNamespace(tns); + // The definition is marked as resolved but not loaded + wsdlDefinition.setUnresolved(false); + wsdlDefinition.setDefinition(null); + } + if (XSD.equals(reader.getName())) { + String tns = reader.getAttributeValue(null, "targetNamespace"); + XSDefinition xsd = xsdFactory.createXSDefinition(); + xsd.setUnresolved(true); + xsd.setNamespace(tns); + xsd.setLocation(URI.create(doc.toURI() + "#" + index)); + index++; + // The definition is marked as resolved but not loaded + xsd.setUnresolved(false); + xsd.setSchema(null); + wsdlDefinition.getXmlSchemas().add(xsd); + } + } + if (reader.hasNext()) { + eventType = reader.next(); + } else { + break; + } + } + return wsdlDefinition; + } finally { + is.close(); + } + } + +} diff --git a/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java new file mode 100644 index 0000000000..cfba9f3519 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java @@ -0,0 +1,284 @@ +/* + * 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 org.apache.tuscany.sca.interfacedef.wsdl.xml; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; + +import javax.wsdl.PortType; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; +import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; +import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject; +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.Problem.Severity; + +/** + * + * @version $Rev: 750323 $ $Date: 2009-03-05 05:52:01 +0000 (Thu, 05 Mar 2009) $ + */ +public class WSDLInterfaceProcessor implements StAXArtifactProcessor, WSDLConstants { + + private WSDLFactory wsdlFactory; + private Monitor monitor; + + public WSDLInterfaceProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) { + this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class); + this.monitor = monitor; + } + + /** + * Report a warning. + * + * @param problems + * @param message + * @param model + */ + private void warning(String message, Object model, Object... messageParameters) { + if (monitor != null) { + Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters); + monitor.problem(problem); + } + } + + /** + * Report a error. + * + * @param problems + * @param message + * @param model + */ + private void error(String message, Object model, Object... messageParameters) { + if (monitor != null) { + Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters); + monitor.problem(problem); + } + } + + /** + * Report a exception. + * + * @param problems + * @param message + * @param model + */ + private void error(String message, Object model, Exception ex) { + if (monitor != null) { + Problem problem = monitor.createProblem(this.getClass().getName(), "interface-wsdlxml-validation-messages", Severity.ERROR, model, message, ex); + monitor.problem(problem); + } + } + + /** + * Create a WSDL interface from a URI. + * @param uri - the URI in the form nameSpace#wsdl.interface(porttypeName) or nameSpace#wsdl.porttype(porttypeName) + * @return a WSDLInterface object + * @throws ContributionReadException + */ + private static String FRAGMENT_INTERFACE = "wsdl.interface"; + private static String FRAGMENT_PORTTYPE = "wsdl.porttype"; + private WSDLInterface createWSDLInterface(String uri) throws ContributionReadException { + + WSDLInterface wsdlInterface = null; + + // Read a QName in the form: + // namespace#wsdl.interface(name) + int index = uri.indexOf('#'); + if (index == -1) { + error("InvalidWSDLInterfaceAttr", wsdlFactory, uri); + //throw new ContributionReadException("Invalid WSDL interface attribute: " + uri); + } else { + // Read the URI and extract namespace and fragment + String namespace = uri.substring(0, index); + String name = uri.substring(index + 1); + String porttype = null; + if( name.contains(FRAGMENT_INTERFACE)) { + // Deal with the case where #wsdl.interface is used + porttype = name.substring("wsdl.interface(".length(), name.length() - 1); + } // end if + if( name.contains(FRAGMENT_PORTTYPE)) { + // Deal with the case where #wsdl.porttype is used + porttype = name.substring("wsdl.porttype(".length(), name.length() - 1); + } // end if + if( porttype == null ) { + error("InvalidWSDLInterfaceAttr", wsdlFactory, uri); + return null; + } // end if + wsdlInterface = wsdlFactory.createWSDLInterface(); + wsdlInterface.setUnresolved(true); + wsdlInterface.setName(new QName(namespace, porttype)); + } // end if + + return wsdlInterface; + } // end method createWSDLInterface + + /** + * Creates a WSDLInterfaceContract from a element in a SCDL file + * + * The form of the element is as follows: + * + * + * where interface = URI pointing to the WSDL document containing a WSDL interface or porttype for the forward call interface + * callbackInterface = URI pointing to the WSDL document containing a WSDL interface or porttype for the callback interface + * + * @param reader - XMLStreamReader holding the element + * @return - the WSDLInterfaceContract + */ + public WSDLInterfaceContract read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException { + // Read an + WSDLInterfaceContract wsdlInterfaceContract = wsdlFactory.createWSDLInterfaceContract(); + + // Read wsdlLocation + String location = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION); + wsdlInterfaceContract.setLocation(location); + + String uri = reader.getAttributeValue(null, INTERFACE); + if (uri != null) { + WSDLInterface wsdlInterface = createWSDLInterface(uri); + if (wsdlInterface != null) + wsdlInterfaceContract.setInterface(wsdlInterface); + } + + uri = reader.getAttributeValue(null, CALLBACK_INTERFACE); + if (uri != null) { + WSDLInterface wsdlCallbackInterface = createWSDLInterface(uri); + if (wsdlCallbackInterface != null) + wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface); + } + + // Skip to end element + while (reader.hasNext()) { + if (reader.next() == END_ELEMENT && INTERFACE_WSDL_QNAME.equals(reader.getName())) { + break; + } + } + return wsdlInterfaceContract; + } + + public void write(WSDLInterfaceContract wsdlInterfaceContract, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException { + // Write an + writer.writeStartElement(WSDLConstants.SCA11_NS, INTERFACE_WSDL); + + // Write interface name + WSDLInterface wsdlInterface = (WSDLInterface)wsdlInterfaceContract.getInterface(); + if (wsdlInterface != null) { + QName qname = wsdlInterface.getName(); + String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")"; + writer.writeAttribute(INTERFACE, uri); + } + + WSDLInterface wsdlCallbackInterface = (WSDLInterface)wsdlInterfaceContract.getCallbackInterface(); + if (wsdlCallbackInterface != null) { + QName qname = wsdlCallbackInterface.getName(); + String uri = qname.getNamespaceURI() + "#wsdl.interface(" + qname.getLocalPart() + ")"; + writer.writeAttribute(CALLBACK_INTERFACE, uri); + } + + // Write location + if (wsdlInterfaceContract.getLocation() != null) { + writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsdlInterfaceContract.getLocation()); + } + + writer.writeEndElement(); + } + + private WSDLInterface resolveWSDLInterface(WSDLInterface wsdlInterface, ModelResolver resolver) throws ContributionResolveException { + + if (wsdlInterface != null && wsdlInterface.isUnresolved()) { + + // Resolve the WSDL interface + wsdlInterface = resolver.resolveModel(WSDLInterface.class, wsdlInterface); + if (wsdlInterface.isUnresolved()) { + + // If the WSDL interface has never been resolved yet, do it now + // First, resolve the WSDL definition for the given namespace + WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition(); + wsdlDefinition.setUnresolved(true); + wsdlDefinition.setNamespace(wsdlInterface.getName().getNamespaceURI()); + WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition); + if (!resolved.isUnresolved()) { + wsdlDefinition.setDefinition(resolved.getDefinition()); + wsdlDefinition.setLocation(resolved.getLocation()); + wsdlDefinition.setURI(resolved.getURI()); + wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions()); + wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas()); + wsdlDefinition.setUnresolved(false); + WSDLObject portType = wsdlDefinition.getWSDLObject(PortType.class, wsdlInterface.getName()); + if (portType != null) { + // Introspect the WSDL portType and add the resulting + // WSDLInterface to the resolver + try { + wsdlDefinition.setDefinition(portType.getDefinition()); + wsdlInterface = wsdlFactory.createWSDLInterface(portType.getElement(), wsdlDefinition, resolver); + wsdlInterface.setWsdlDefinition(wsdlDefinition); + resolver.addModel(wsdlInterface); + } catch (InvalidInterfaceException e) { + ContributionResolveException ce = new ContributionResolveException("Invalid interface when resolving " + + portType.toString(), e); + error("ContributionResolveException", wsdlFactory, ce); + //throw ce; + } + } + else { + warning("WsdlInterfaceDoesNotMatch", wsdlDefinition, wsdlInterface.getName()); + } // end if + } else { + // If we get here, the WSDLDefinition is unresolved... + ContributionResolveException ce = new ContributionResolveException("WSDLDefinition unresolved " + + wsdlInterface.getName().getNamespaceURI() ); + error("ContributionResolveException", wsdlFactory, ce); + }// end if + } // end if + } // end if + return wsdlInterface; + } + + public void resolve(WSDLInterfaceContract wsdlInterfaceContract, ModelResolver resolver) throws ContributionResolveException { + + // Resolve the interface and callback interface + WSDLInterface wsdlInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getInterface(), resolver); + wsdlInterfaceContract.setInterface(wsdlInterface); + + WSDLInterface wsdlCallbackInterface = resolveWSDLInterface((WSDLInterface)wsdlInterfaceContract.getCallbackInterface(), resolver); + wsdlInterfaceContract.setCallbackInterface(wsdlCallbackInterface); + } + + public QName getArtifactType() { + return WSDLConstants.INTERFACE_WSDL_QNAME; + } + + public Class getModelType() { + return WSDLInterfaceContract.class; + } +} diff --git a/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java new file mode 100644 index 0000000000..686236d1c2 --- /dev/null +++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java @@ -0,0 +1,512 @@ +/* + * 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 org.apache.tuscany.sca.interfacedef.wsdl.xml; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Collections; + +import javax.wsdl.Definition; +import javax.wsdl.Operation; +import javax.wsdl.PortType; +import javax.wsdl.Types; +import javax.wsdl.WSDLException; +import javax.wsdl.extensions.AttributeExtensible; +import javax.wsdl.extensions.ExtensibilityElement; +import javax.wsdl.extensions.ExtensionDeserializer; +import javax.wsdl.extensions.ExtensionRegistry; +import javax.wsdl.extensions.ExtensionSerializer; +import javax.wsdl.extensions.UnknownExtensibilityElement; +import javax.wsdl.extensions.UnknownExtensionDeserializer; +import javax.wsdl.extensions.UnknownExtensionSerializer; +import javax.wsdl.extensions.schema.Schema; +import javax.wsdl.xml.WSDLLocator; +import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ContributionFactory; +import org.apache.tuscany.sca.contribution.DefaultImport; +import org.apache.tuscany.sca.contribution.Import; +import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; +import org.apache.tuscany.sca.contribution.processor.ContributionReadException; +import org.apache.tuscany.sca.contribution.processor.ContributionRuntimeException; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition; +import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory; +import org.apache.tuscany.sca.xsd.XSDFactory; +import org.apache.tuscany.sca.xsd.XSDefinition; +import org.apache.tuscany.sca.xsd.xml.XMLDocumentHelper; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; + +/** + * A Model Resolver for WSDL models. + * + * @version $Rev: 557916 $ $Date: 2007-07-20 01:04:40 -0700 (Fri, 20 Jul 2007) $ + */ +public class WSDLModelResolver implements ModelResolver { + //Schema element names + public static final String ELEM_SCHEMA = "schema"; + + //Schema URI + public static final String NS_URI_XSD_1999 = "http://www.w3.org/1999/XMLSchema"; + public static final String NS_URI_XSD_2000 = "http://www.w3.org/2000/10/XMLSchema"; + public static final String NS_URI_XSD_2001 = "http://www.w3.org/2001/XMLSchema"; + + //Schema QNames + public static final QName Q_ELEM_XSD_1999 = new QName(NS_URI_XSD_1999, ELEM_SCHEMA); + public static final QName Q_ELEM_XSD_2000 = new QName(NS_URI_XSD_2000, ELEM_SCHEMA); + public static final QName Q_ELEM_XSD_2001 = new QName(NS_URI_XSD_2001, ELEM_SCHEMA); + public static final List XSD_QNAME_LIST = + Arrays.asList(new QName[] {Q_ELEM_XSD_1999, Q_ELEM_XSD_2000, Q_ELEM_XSD_2001}); + + // ---- Policy WSDL Attachments + + public static final QName Q_POLICY_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "requires"); + public static final QName Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION = new QName("http://docs.oasis-open.org/ns/opencsa/sca/200903", "endsConversation"); + + // ---- Stuff added for BPEL extension elements --- Mike Edwards 01/05/2008 + public static final String ELEM_PLINKTYPE = "partnerLinkType"; + public static final String NS_BPEL_1_1 = "http://schemas.xmlsoap.org/ws/2004/03/partner-link/"; + public static final QName BPEL_PLINKTYPE = new QName( NS_BPEL_1_1, ELEM_PLINKTYPE ); + // ---- end of BPEL extension stuff + + private Contribution contribution; + private Map> map = new HashMap>(); + + private ExtensionRegistry wsdlExtensionRegistry; + + private WSDLFactory wsdlFactory; + private javax.wsdl.factory.WSDLFactory wsdl4jFactory; + private ContributionFactory contributionFactory; + private XSDFactory xsdFactory; + + public WSDLModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) { + this.contribution = contribution; + + this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class); + this.wsdl4jFactory = modelFactories.getFactory(javax.wsdl.factory.WSDLFactory.class); + this.contributionFactory = modelFactories.getFactory(ContributionFactory.class); + this.xsdFactory = modelFactories.getFactory(XSDFactory.class); + + wsdlExtensionRegistry = this.wsdl4jFactory.newPopulatedExtensionRegistry(); + // REVIEW: [rfeng] Disable the schema extension for WSDL4J to avoid aggressive loading + ExtensionDeserializer deserializer = new UnknownExtensionDeserializer(); + ExtensionSerializer serializer = new UnknownExtensionSerializer(); + for (QName schema : XSD_QNAME_LIST) { + wsdlExtensionRegistry.registerSerializer(Types.class, schema, serializer); + wsdlExtensionRegistry.registerDeserializer(Types.class, schema, deserializer); + } + // ---- Policy WSDL Extensions + try { + wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE); + wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE); + } catch (NoSuchMethodError e) { + // That method does not exist on older WSDL4J levels + } + + // ---- BPEL additions + serializer = new BPELExtensionHandler(); + deserializer = new BPELExtensionHandler(); + wsdlExtensionRegistry.registerSerializer(Definition.class, BPEL_PLINKTYPE, serializer); + wsdlExtensionRegistry.registerDeserializer(Definition.class, BPEL_PLINKTYPE, deserializer); + // ---- end of BPEL additions + } + + /** + * Implementation of a WSDL locator. + */ + private class WSDLLocatorImpl implements WSDLLocator { + private InputStream inputStream; + private URL base; + private String latestImportURI; + + public WSDLLocatorImpl(URL base, InputStream is) { + this.base = base; + this.inputStream = is; + } + + public void close() { + try { + inputStream.close(); + } catch (IOException e) { + // Ignore + } + } + + public InputSource getBaseInputSource() { + try { + return XMLDocumentHelper.getInputSource(base, inputStream); + } catch (IOException e) { + throw new IllegalArgumentException(e); + } + } + + public String getBaseURI() { + return base.toString(); + } + + public InputSource getImportInputSource(String parentLocation, String importLocation) { + try { + if (importLocation == null) { + throw new IllegalArgumentException("Required attribute 'location' is missing."); + } + + URL url = null; + if (importLocation.startsWith("/")) { + // The URI is relative to the contribution + String uri = importLocation.substring(1); + + Artifact proxyArtifact = contributionFactory.createArtifact(); + proxyArtifact.setURI(uri); + + //use contribution resolution (this supports import/export) + Artifact importedArtifact = + contribution.getModelResolver().resolveModel(Artifact.class, proxyArtifact); + if (importedArtifact.getLocation() != null) { + //get the artifact URL + url = new URL(importedArtifact.getLocation()); + } + } else { + url = new URL(new URL(parentLocation), importLocation); + } + if (url == null) { + return null; + } + latestImportURI = url.toString(); + return XMLDocumentHelper.getInputSource(url); + } catch (Exception e) { + throw new ContributionRuntimeException(e); + } + } + + public String getLatestImportURI() { + return latestImportURI; + } + + } + + public void addModel(Object resolved) { + WSDLDefinition definition = (WSDLDefinition)resolved; + for (XSDefinition d : definition.getXmlSchemas()) { + if (contribution != null) { + contribution.getModelResolver().addModel(d); + } + } + List list = map.get(definition.getNamespace()); + if (list == null) { + list = new ArrayList(); + map.put(definition.getNamespace(), list); + } + list.add(definition); + } + + public Object removeModel(Object resolved) { + WSDLDefinition definition = (WSDLDefinition)resolved; + List list = map.get(definition.getNamespace()); + if (list == null) { + return null; + } else { + return list.remove(definition); + } + } + + /** + * Create a facade Definition which imports all the definitions + * + * @param definitions A list of the WSDL definitions under the same target namespace + * @return The aggregated WSDL definition + */ + private WSDLDefinition aggregate(List definitions) { + if (definitions == null || definitions.size() == 0) { + return null; + } + if (definitions.size() == 1) { + WSDLDefinition d = definitions.get(0); + loadOnDemand(d); + return d; + } + WSDLDefinition aggregated = wsdlFactory.createWSDLDefinition(); + for (WSDLDefinition d : definitions) { + loadOnDemand(d); + } + Definition facade = wsdl4jFactory.newDefinition(); + String ns = definitions.get(0).getNamespace(); + facade.setQName(new QName(ns, "$aggregated$")); + facade.setTargetNamespace(ns); + + for (WSDLDefinition d : definitions) { + if (d.getDefinition() != null) { + javax.wsdl.Import imp = facade.createImport(); + imp.setNamespaceURI(d.getNamespace()); + imp.setDefinition(d.getDefinition()); + imp.setLocationURI(d.getDefinition().getDocumentBaseURI()); + facade.addImport(imp); + aggregated.getXmlSchemas().addAll(d.getXmlSchemas()); + aggregated.getImportedDefinitions().add(d); + } + } + aggregated.setDefinition(facade); + definitions.clear(); + definitions.add(aggregated); + return aggregated; + } + + public T resolveModel(Class modelClass, T unresolved) { + + WSDLDefinition resolved = null; + String namespace = ((WSDLDefinition)unresolved).getNamespace(); + if (namespace == null) { + return modelClass.cast(unresolved); + } + + // Lookup a definition for the given namespace, from imports + List locations = new ArrayList(); + // Collection of namespace imports with location + Map locationMap = new HashMap(); + for (Import import_ : this.contribution.getImports()) { + if (import_ instanceof NamespaceImport) { + NamespaceImport namespaceImport = (NamespaceImport)import_; + if (namespaceImport.getNamespace().equals(namespace)) { + if (namespaceImport.getLocation() == null) { + // Delegate the resolution to the namespace import resolver + resolved = + namespaceImport.getModelResolver().resolveModel(WSDLDefinition.class, + (WSDLDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } else { + // We might have multiple imports for the same namespace, + // need to search them in lexical order. + locations.add(namespaceImport.getLocation()); + } + } + } else if (import_ instanceof DefaultImport) { + + // Delegate the resolution to the default import resolver + resolved = + import_.getModelResolver().resolveModel(WSDLDefinition.class, + (WSDLDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + } + // Search namespace imports with locations in lexical order + Collections.sort(locations); + for (String location : locations) { + NamespaceImport namespaceImport = (NamespaceImport)locationMap.get(location); + // Delegate the resolution to the namespace import resolver + resolved = + namespaceImport.getModelResolver().resolveModel(WSDLDefinition.class, + (WSDLDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + + + // Not found, lookup a definition for the given namespace, within contribution + List list = map.get(namespace); + resolved = aggregate(list); + if (resolved != null && !resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + + return modelClass.cast(unresolved); + } + + /** + * Load the WSDL definition on demand + * @param def + */ + private void loadOnDemand(WSDLDefinition def) { + if (def.getDefinition() == null && def.getLocation() != null) { + // Load the definition on-demand + try { + loadDefinition(def); + } catch (ContributionReadException e) { + throw new RuntimeException(e); + } + } + } + + // private Map loadedDefinitions = new Hashtable(); + + /** + * Load the WSDL definition and inline schemas + * + * @param wsdlDef + * @throws ContributionReadException + */ + private void loadDefinition(WSDLDefinition wsdlDef) throws ContributionReadException { + if (wsdlDef.getDefinition() != null || wsdlDef.getLocation() == null) { + return; + } + try { + URL artifactURL = wsdlDef.getLocation().toURL(); + // Read a WSDL document + InputStream is = artifactURL.openStream(); + WSDLReader reader = wsdl4jFactory.newWSDLReader(); + reader.setFeature("javax.wsdl.verbose", false); + reader.setFeature("javax.wsdl.importDocuments", true); + // FIXME: We need to decide if we should disable the import processing by WSDL4J + // reader.setFeature("javax.wsdl.importDocuments", false); + reader.setExtensionRegistry(wsdlExtensionRegistry); // use a custom registry + + WSDLLocatorImpl locator = new WSDLLocatorImpl(artifactURL, is); + Definition definition = reader.readWSDL(locator); + wsdlDef.setDefinition(definition); + + // If this definition imports any definitions from other namespaces, + // set the correct WSDLDefinition import relationships. + for (Map.Entry> entry : + ((Map>)definition.getImports()).entrySet()) { + if (!entry.getKey().equals(definition.getTargetNamespace())) { + WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition(); + wsdlDefinition.setUnresolved(true); + wsdlDefinition.setNamespace(entry.getKey()); + WSDLDefinition resolved = resolveModel(WSDLDefinition.class, wsdlDefinition); + if (!resolved.isUnresolved()) { + for (javax.wsdl.Import imp : entry.getValue()) { + if (resolved.getDefinition().getDocumentBaseURI().equals(imp.getDefinition().getDocumentBaseURI())) { + // this WSDLDefinition contains the imported document + wsdlDef.getImportedDefinitions().add(resolved); + } else { + // this is a facade, so look in its imported definitions + for (WSDLDefinition def : resolved.getImportedDefinitions()) { + if (def.getDefinition().getDocumentBaseURI().equals(imp.getDefinition().getDocumentBaseURI())) { + wsdlDef.getImportedDefinitions().add(def); + break; + } + } + } + } + } + } + } + + //Read inline schemas + readInlineSchemas(wsdlDef, definition); + } catch (WSDLException e) { + throw new ContributionReadException(e); + } catch (IOException e) { + throw new ContributionReadException(e); + } + } + + private Document promote(Element element) { + Document doc = (Document)element.getOwnerDocument().cloneNode(false); + Element schema = (Element)doc.importNode(element, true); + doc.appendChild(schema); + Node parent = element.getParentNode(); + while (parent instanceof Element) { + Element root = (Element)parent; + NamedNodeMap nodeMap = root.getAttributes(); + if (nodeMap != null) { + for (int i = 0; i < nodeMap.getLength(); i++) { + Attr attr = (Attr)nodeMap.item(i); + String name = attr.getName(); + if ("xmlns".equals(name) || name.startsWith("xmlns:")) { + if (schema.getAttributeNode(name) == null) { + schema.setAttributeNodeNS((Attr)doc.importNode(attr, true)); + } + } + } + } + parent = parent.getParentNode(); + } + doc.setDocumentURI(element.getOwnerDocument().getDocumentURI()); + return doc; + } + + /** + * Populate the inline schemas including those from the imported definitions + * + * @param definition + * @param schemaCollection + */ + private void readInlineSchemas(WSDLDefinition wsdlDefinition, Definition definition) { + if (contribution == null) { + // Check null for test cases + return; + } + Types types = definition.getTypes(); + if (types != null) { + int index = 0; + for (Object ext : types.getExtensibilityElements()) { + ExtensibilityElement extElement = (ExtensibilityElement)ext; + Element element = null; + if (XSD_QNAME_LIST.contains(extElement.getElementType())) { + if (extElement instanceof Schema) { + element = ((Schema)extElement).getElement(); + } else if (extElement instanceof UnknownExtensibilityElement) { + element = ((UnknownExtensibilityElement)extElement).getElement(); + } + } + if (element != null) { + Document doc = promote(element); + XSDefinition xsDefinition = xsdFactory.createXSDefinition(); + xsDefinition.setUnresolved(true); + xsDefinition.setNamespace(element.getAttribute("targetNamespace")); + xsDefinition.setDocument(doc); + xsDefinition.setLocation(URI.create(doc.getDocumentURI() + "#" + index)); + XSDefinition resolved = + contribution.getModelResolver().resolveModel(XSDefinition.class, xsDefinition); + if (resolved != null && !resolved.isUnresolved()) { + if (!wsdlDefinition.getXmlSchemas().contains(resolved)) { + // Don't add resolved because it may be an aggregate that + // contains more than we need. The resolver will have + // set the specific schema we need into unresolved. + wsdlDefinition.getXmlSchemas().add(xsDefinition); + } + } + index++; + } + } + } + for (Object imports : definition.getImports().values()) { + List impList = (List)imports; + for (Object i : impList) { + javax.wsdl.Import anImport = (javax.wsdl.Import)i; + // Read inline schemas + if (anImport.getDefinition() != null) { + readInlineSchemas(wsdlDefinition, anImport.getDefinition()); + } + } + } + } + +} -- cgit v1.2.3