From c2668bd587ecd6a08997b4141e023623f40fd89b Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 20 Jul 2009 20:23:19 +0000 Subject: Merge the fix for TUSCANY-3153 from 16.-SNAPSHOT git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@795993 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/xsd/xml/XSDModelResolver.java | 645 +++++++++++---------- 1 file changed, 325 insertions(+), 320 deletions(-) (limited to 'branches/sca-java-1.5.1/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java') diff --git a/branches/sca-java-1.5.1/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/branches/sca-java-1.5.1/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java index 4971c0eb98..51b275d0ae 100644 --- a/branches/sca-java-1.5.1/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java +++ b/branches/sca-java-1.5.1/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -1,320 +1,325 @@ -/* - * 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.xsd.xml; - -import java.io.IOException; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.DefaultImport; -import org.apache.tuscany.sca.contribution.Import; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.service.ContributionRuntimeException; -import org.apache.tuscany.sca.xsd.DefaultXSDFactory; -import org.apache.tuscany.sca.xsd.XSDFactory; -import org.apache.tuscany.sca.xsd.XSDefinition; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaCollection; -import org.apache.ws.commons.schema.XmlSchemaInclude; -import org.apache.ws.commons.schema.resolver.URIResolver; -import org.xml.sax.InputSource; - -/** - * A Model Resolver for XSD models. - * - * @version $Rev$ $Date$ - */ -public class XSDModelResolver implements ModelResolver { - private static final String AGGREGATED_XSD = "http://tuscany.apache.org/aggregated.xsd"; - private XSDFactory factory; - private Contribution contribution; - private Map> map = new HashMap>(); - private XmlSchemaCollection schemaCollection; - - public XSDModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { - this.contribution = contribution; - this.schemaCollection = new XmlSchemaCollection(); - schemaCollection.setSchemaResolver(new URIResolverImpl(contribution)); - this.factory = new DefaultXSDFactory(); - } - - public void addModel(Object resolved) { - XSDefinition definition = (XSDefinition)resolved; - 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) { - XSDefinition definition = (XSDefinition)resolved; - List list = map.get(definition.getNamespace()); - if (list == null) { - return null; - } else { - return list.remove(definition); - } - } - - public T resolveModel(Class modelClass, T unresolved) { - - XSDefinition definition = (XSDefinition)unresolved; - String namespace = definition.getNamespace(); - - // Lookup a definition for the given namespace within the - // current contribution. - List list = map.get(namespace); - XSDefinition modelXSD = null; - if (list != null && definition.getDocument() != null) { - // Set the document for the inline schema - int index = list.indexOf(definition); - if (index != -1) { // a matching (not identical) document was found - modelXSD = list.get(index); - modelXSD.setDocument(definition.getDocument()); - } - } - if (list == null && definition.getDocument() != null) { - // Hit for the 1st time - list = new ArrayList(); - list.add(definition); - map.put(namespace, list); - } - XSDefinition resolved = null; - try { - resolved = aggregate(list); - } catch (ContributionRuntimeException e) { - throw new ContributionRuntimeException(e); - } - if (resolved != null && !resolved.isUnresolved()) { - if (definition.isUnresolved() && definition.getSchema() == null && modelXSD != null) { - // Update the unresolved model with schema information and mark it - // resolved. This information in the unresolved model is needed when - // this method is called by WSDLModelResolver.readInlineSchemas(). - definition.setSchema(modelXSD.getSchema()); - definition.setSchemaCollection(modelXSD.getSchemaCollection()); - definition.setUnresolved(false); - } - return modelClass.cast(resolved); - } - - // No definition found, delegate the resolution to the imports - for (Import import_ : this.contribution.getImports()) { - if (import_ instanceof NamespaceImport) { - NamespaceImport namespaceImport = (NamespaceImport)import_; - if (namespaceImport.getNamespace().equals(namespace)) { - - // Delegate the resolution to the namespace import resolver - resolved = - namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); - if (!resolved.isUnresolved()) { - return modelClass.cast(resolved); - } - } - } else if (import_ instanceof DefaultImport) { - - // Delegate the resolution to the default import resolver - resolved = - import_.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); - if (!resolved.isUnresolved()) { - return modelClass.cast(resolved); - } - } - } - return modelClass.cast(unresolved); - } - - private void loadOnDemand(XSDefinition definition) throws ContributionRuntimeException { - if (definition.getSchema() != null) { - return; - } - if (definition.getDocument() != null) { - String uri = null; - if (definition.getLocation() != null) { - uri = definition.getLocation().toString(); - } - XmlSchema schema = null; - try { - schema = schemaCollection.read(definition.getDocument(), uri, null); - } catch (RuntimeException e) { - // find original cause of the problem - Throwable cause = e; - while (cause.getCause() != null) { - cause = cause.getCause(); - } - throw new ContributionRuntimeException(cause); - } - definition.setSchemaCollection(schemaCollection); - definition.setSchema(schema); - definition.setUnresolved(false); - } else if (definition.getLocation() != null) { - if (definition.getLocation().getFragment() != null) { - // It's an inline schema - // FIXME: We need to trigger the loading of the enclosing WSDL models - return; - } - // Read an XSD document - InputSource xsd; - try { - xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); - } catch (IOException e) { - throw new ContributionRuntimeException(e); - } - for (XmlSchema d : schemaCollection.getXmlSchemas()) { - if (isSameNamespace(d.getTargetNamespace(), definition.getNamespace())) { - if (d.getSourceURI().equals(definition.getLocation().toString())) - return; - } - } - XmlSchema schema = null; - try { - schema = schemaCollection.read(xsd, null); - } catch (RuntimeException e) { - // find original cause of the problem - Throwable cause = e; - while (cause.getCause() != null) { - cause = cause.getCause(); - } - throw new ContributionRuntimeException(cause); - } - definition.setSchemaCollection(schemaCollection); - definition.setSchema(schema); - } - } - - private boolean isSameNamespace(String ns1, String ns2) { - if (ns1 == null) { - return ns2 == null; - } else { - return ns1.equals(ns2); - } - } - - /** - * Create a facade XmlSchema which includes all the definitions - * - * @param definitions A list of the XmlSchema under the same target - * namespace - * @return The aggregated XmlSchema - */ - private XSDefinition aggregate(List definitions) throws ContributionRuntimeException { - if (definitions == null || definitions.size() == 0) { - return null; - } - if (definitions.size() == 1) { - XSDefinition d = definitions.get(0); - loadOnDemand(d); - return d; - } - XSDefinition aggregated = factory.createXSDefinition(); - for (XSDefinition d : definitions) { - loadOnDemand(d); - } - String ns = definitions.get(0).getNamespace(); - - XmlSchema facade = null; - // Check if the facade XSD is already in the collection - for (XmlSchema s : schemaCollection.getXmlSchema(AGGREGATED_XSD)) { - if (ns.equals(s.getTargetNamespace())) { - facade = s; - break; - } - } - if (facade == null) { - // This will add the facade into the collection - facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); - } - - for (XmlSchema d : schemaCollection.getXmlSchemas()) { - if (ns.equals(d.getTargetNamespace())) { - if (d == facade) { - continue; - } - XmlSchemaInclude include = new XmlSchemaInclude(); - include.setSchema(d); - include.setSourceURI(d.getSourceURI()); - include.setSchemaLocation(d.getSourceURI()); - facade.getIncludes().add(include); - facade.getItems().add(include); - } - } - aggregated.setUnresolved(true); - aggregated.setSchema(facade); - aggregated.setNamespace(ns); - aggregated.setAggregatedDefinitions(definitions); - aggregated.setUnresolved(false); - - // FIXME: [rfeng] This is hacky - //definitions.clear(); - //definitions.add(aggregated); - return aggregated; - } - - /** - * URI resolver implementation for XML schema - */ - public static class URIResolverImpl implements URIResolver { - private Contribution contribution; - - public URIResolverImpl(Contribution contribution) { - this.contribution = contribution; - } - - public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) { - try { - if (schemaLocation == null) { - return null; - } - URL url = null; - if (schemaLocation.startsWith("/")) { - // The URI is relative to the contribution - String uri = schemaLocation.substring(1); - for (Artifact a : contribution.getArtifacts()) { - if (a.getURI().equals(uri)) { - url = new URL(a.getLocation()); - break; - } - } - if (url == null) { - // URI not found in the contribution; return a default InputSource - // so that the XmlSchema code will produce a useful diagnostic - return new InputSource(schemaLocation); - } - } else { - url = new URL(new URL(baseUri), schemaLocation); - } - return XMLDocumentHelper.getInputSource(url); - } catch (IOException e) { - // Invalid URI; return a default InputSource so that the - // XmlSchema code will produce a useful diagnostic - return new InputSource(schemaLocation); - } - } - } - -} +/* + * 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.xsd.xml; + +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.tuscany.sca.contribution.Artifact; +import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.DefaultImport; +import org.apache.tuscany.sca.contribution.Import; +import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; +import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.contribution.service.ContributionRuntimeException; +import org.apache.tuscany.sca.xsd.DefaultXSDFactory; +import org.apache.tuscany.sca.xsd.XSDFactory; +import org.apache.tuscany.sca.xsd.XSDefinition; +import org.apache.ws.commons.schema.XmlSchema; +import org.apache.ws.commons.schema.XmlSchemaCollection; +import org.apache.ws.commons.schema.XmlSchemaInclude; +import org.apache.ws.commons.schema.resolver.URIResolver; +import org.xml.sax.InputSource; + +/** + * A Model Resolver for XSD models. + * + * @version $Rev$ $Date$ + */ +public class XSDModelResolver implements ModelResolver { + private static final String AGGREGATED_XSD = "http://tuscany.apache.org/aggregated.xsd"; + private XSDFactory factory; + private Contribution contribution; + private Map> map = new HashMap>(); + private XmlSchemaCollection schemaCollection; + + public XSDModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) { + this.contribution = contribution; + this.schemaCollection = new XmlSchemaCollection(); + schemaCollection.setSchemaResolver(new URIResolverImpl(contribution)); + this.factory = new DefaultXSDFactory(); + } + + public void addModel(Object resolved) { + XSDefinition definition = (XSDefinition)resolved; + 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) { + XSDefinition definition = (XSDefinition)resolved; + List list = map.get(definition.getNamespace()); + if (list == null) { + return null; + } else { + return list.remove(definition); + } + } + + public T resolveModel(Class modelClass, T unresolved) { + + XSDefinition definition = (XSDefinition)unresolved; + String namespace = definition.getNamespace(); + + // Lookup a definition for the given namespace within the + // current contribution. + List list = map.get(namespace); + XSDefinition modelXSD = null; + if (list != null && definition.getDocument() != null) { + // Set the document for the inline schema + int index = list.indexOf(definition); + if (index != -1) { // a matching (not identical) document was found + modelXSD = list.get(index); + modelXSD.setDocument(definition.getDocument()); + } + } + if (list == null && definition.getDocument() != null) { + // Hit for the 1st time + list = new ArrayList(); + list.add(definition); + map.put(namespace, list); + } + XSDefinition resolved = null; + try { + resolved = aggregate(list); + } catch (ContributionRuntimeException e) { + throw new ContributionRuntimeException(e); + } + if (resolved != null && !resolved.isUnresolved()) { + if (definition.isUnresolved() && definition.getSchema() == null && modelXSD != null) { + // Update the unresolved model with schema information and mark it + // resolved. This information in the unresolved model is needed when + // this method is called by WSDLModelResolver.readInlineSchemas(). + definition.setSchema(modelXSD.getSchema()); + definition.setSchemaCollection(modelXSD.getSchemaCollection()); + definition.setUnresolved(false); + } + return modelClass.cast(resolved); + } + + // No definition found, delegate the resolution to the imports + for (Import import_ : this.contribution.getImports()) { + if (import_ instanceof NamespaceImport) { + NamespaceImport namespaceImport = (NamespaceImport)import_; + if (namespaceImport.getNamespace().equals(namespace)) { + + // Delegate the resolution to the namespace import resolver + resolved = + namespaceImport.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + } else if (import_ instanceof DefaultImport) { + + // Delegate the resolution to the default import resolver + resolved = + import_.getModelResolver().resolveModel(XSDefinition.class, (XSDefinition)unresolved); + if (!resolved.isUnresolved()) { + return modelClass.cast(resolved); + } + } + } + return modelClass.cast(unresolved); + } + + private void loadOnDemand(XSDefinition definition) throws ContributionRuntimeException { + if (definition.getSchema() != null) { + return; + } + if (definition.getDocument() != null) { + String uri = null; + if (definition.getLocation() != null) { + uri = definition.getLocation().toString(); + } + XmlSchema schema = null; + try { + schema = schemaCollection.read(definition.getDocument(), uri, null); + } catch (RuntimeException e) { + // find original cause of the problem + Throwable cause = e; + while (cause.getCause() != null && cause != cause.getCause()) { + cause = cause.getCause(); + } + throw new ContributionRuntimeException(cause); + } + definition.setSchemaCollection(schemaCollection); + definition.setSchema(schema); + definition.setUnresolved(false); + } else if (definition.getLocation() != null) { + if (definition.getLocation().getFragment() != null) { + // It's an inline schema + // FIXME: We need to trigger the loading of the enclosing WSDL models + return; + } + // Read an XSD document + XmlSchema schema = null; + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (isSameNamespace(d.getTargetNamespace(), definition.getNamespace())) { + if (d.getSourceURI().equals(definition.getLocation().toString())) { + schema = d; + break; + } + } + } + if (schema == null) { + InputSource xsd = null; + try { + xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); + } catch (IOException e) { + throw new ContributionRuntimeException(e); + } + + try { + schema = schemaCollection.read(xsd, null); + } catch (RuntimeException e) { + // find original cause of the problem + Throwable cause = e; + while (cause.getCause() != null && cause != cause.getCause()) { + cause = cause.getCause(); + } + throw new ContributionRuntimeException(cause); + } + } + definition.setSchemaCollection(schemaCollection); + definition.setSchema(schema); + } + } + + private boolean isSameNamespace(String ns1, String ns2) { + if (ns1 == null) { + return ns2 == null; + } else { + return ns1.equals(ns2); + } + } + + /** + * Create a facade XmlSchema which includes all the definitions + * + * @param definitions A list of the XmlSchema under the same target + * namespace + * @return The aggregated XmlSchema + */ + private XSDefinition aggregate(List definitions) throws ContributionRuntimeException { + if (definitions == null || definitions.size() == 0) { + return null; + } + if (definitions.size() == 1) { + XSDefinition d = definitions.get(0); + loadOnDemand(d); + return d; + } + XSDefinition aggregated = factory.createXSDefinition(); + for (XSDefinition d : definitions) { + loadOnDemand(d); + } + String ns = definitions.get(0).getNamespace(); + + XmlSchema facade = null; + // Check if the facade XSD is already in the collection + for (XmlSchema s : schemaCollection.getXmlSchema(AGGREGATED_XSD)) { + if (ns.equals(s.getTargetNamespace())) { + facade = s; + break; + } + } + if (facade == null) { + // This will add the facade into the collection + facade = new XmlSchema(ns, AGGREGATED_XSD, schemaCollection); + } + + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (ns.equals(d.getTargetNamespace())) { + if (d == facade) { + continue; + } + XmlSchemaInclude include = new XmlSchemaInclude(); + include.setSchema(d); + include.setSourceURI(d.getSourceURI()); + include.setSchemaLocation(d.getSourceURI()); + facade.getIncludes().add(include); + facade.getItems().add(include); + } + } + aggregated.setUnresolved(true); + aggregated.setSchema(facade); + aggregated.setNamespace(ns); + aggregated.setAggregatedDefinitions(definitions); + aggregated.setUnresolved(false); + + // FIXME: [rfeng] This is hacky + //definitions.clear(); + //definitions.add(aggregated); + return aggregated; + } + + /** + * URI resolver implementation for XML schema + */ + public static class URIResolverImpl implements URIResolver { + private Contribution contribution; + + public URIResolverImpl(Contribution contribution) { + this.contribution = contribution; + } + + public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) { + try { + if (schemaLocation == null) { + return null; + } + URL url = null; + if (schemaLocation.startsWith("/")) { + // The URI is relative to the contribution + String uri = schemaLocation.substring(1); + for (Artifact a : contribution.getArtifacts()) { + if (a.getURI().equals(uri)) { + url = new URL(a.getLocation()); + break; + } + } + if (url == null) { + // URI not found in the contribution; return a default InputSource + // so that the XmlSchema code will produce a useful diagnostic + return new InputSource(schemaLocation); + } + } else { + url = new URL(new URL(baseUri), schemaLocation); + } + return XMLDocumentHelper.getInputSource(url); + } catch (IOException e) { + // Invalid URI; return a default InputSource so that the + // XmlSchema code will produce a useful diagnostic + return new InputSource(schemaLocation); + } + } + } + +} -- cgit v1.2.3