From 8c5aabb9e1adebfebfe8a77596287cc04ee8cd57 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 23 Apr 2009 07:18:40 +0000 Subject: Merge xsd-xml module into xsd module to tentatively test out the emerging ML consensus on module make up git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@767828 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/xsd/META-INF/MANIFEST.MF | 38 ++- java/sca/modules/xsd/pom.xml | 10 + .../tuscany/sca/xsd/xml/XMLDocumentHelper.java | 184 ++++++++++++++ .../tuscany/sca/xsd/xml/XSDDocumentProcessor.java | 101 ++++++++ .../tuscany/sca/xsd/xml/XSDModelResolver.java | 279 +++++++++++++++++++++ ...sca.contribution.processor.URLArtifactProcessor | 19 ++ ...tuscany.sca.contribution.resolver.ModelResolver | 18 ++ .../xsd-xml-validation-messages.properties | 23 ++ .../sca/xsd/xml/XMLDocumentHelperTestCase.java | 50 ++++ .../sca/xsd/xml/XSDDocumentProcessorTestCase.java | 89 +++++++ .../xsd/src/test/resources/xsd/greeting.xsd | 29 +++ .../modules/xsd/src/test/resources/xsd/name.xsd | 29 +++ 12 files changed, 863 insertions(+), 6 deletions(-) create mode 100644 java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java create mode 100644 java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java create mode 100644 java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java create mode 100644 java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor create mode 100644 java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver create mode 100644 java/sca/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties create mode 100644 java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java create mode 100644 java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java create mode 100644 java/sca/modules/xsd/src/test/resources/xsd/greeting.xsd create mode 100644 java/sca/modules/xsd/src/test/resources/xsd/name.xsd (limited to 'java/sca/modules/xsd') diff --git a/java/sca/modules/xsd/META-INF/MANIFEST.MF b/java/sca/modules/xsd/META-INF/MANIFEST.MF index 349dd4b438..f88a2e4ad3 100644 --- a/java/sca/modules/xsd/META-INF/MANIFEST.MF +++ b/java/sca/modules/xsd/META-INF/MANIFEST.MF @@ -1,7 +1,21 @@ Manifest-Version: 1.0 -Export-Package: org.apache.tuscany.sca.xsd;uses:="org.apache.ws.common - s.schema,org.apache.tuscany.sca.assembly,org.w3c.dom,javax.xml.namesp - ace";version="2.0.0" +Export-Package: org.apache.tuscany.sca.xsd;version="2.0.0"; + uses:="org.apache.ws.commons.schema, + org.apache.tuscany.sca.assembly, + org.w3c.dom,javax.xml.namespace", + org.apache.tuscany.sca.xsd.xml;version="2.0.0"; + uses:="org.apache.ws.commons.schema, + org.apache.ws.commons.schema.resolver, + org.apache.tuscany.sca.contribution, + org.apache.tuscany.sca.core, + org.apache.tuscany.sca.monitor, + org.w3c.dom, + org.apache.tuscany.sca.contribution.namespace, + javax.xml.namespace, + org.xml.sax, + javax.xml.stream, + org.apache.tuscany.sca.contribution.resolver, + org.apache.tuscany.sca.contribution.processor" Private-Package: org.apache.tuscany.sca.xsd.impl;version="2.0.0" Tool: Bnd-0.0.255 Bundle-Name: Apache Tuscany SCA XSD Model @@ -12,9 +26,21 @@ Bnd-LastModified: 1225397174343 Bundle-ManifestVersion: 2 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: Apache Tuscany SCA XSD Model -Import-Package: javax.xml.namespace,org.apache.tuscany.sca.assembly;ve - rsion="2.0.0",org.apache.tuscany.sca.xsd;version="2.0.0",org.apache.ws.co - mmons.schema,org.w3c.dom +Import-Package: javax.xml.namespace, + javax.xml.stream, + org.apache.tuscany.sca.assembly;version="2.0.0", + org.apache.tuscany.sca.contribution;version="2.0.0", + org.apache.tuscany.sca.contribution.namespace;version="2.0.0", + org.apache.tuscany.sca.contribution.processor;version="2.0.0", + org.apache.tuscany.sca.contribution.resolver;version="2.0.0", + org.apache.tuscany.sca.core;version="2.0.0", + org.apache.tuscany.sca.monitor;version="2.0.0", + org.apache.tuscany.sca.xsd;version="2.0.0", + org.apache.tuscany.sca.xsd.xml;version="2.0.0", + org.apache.ws.commons.schema, + org.apache.ws.commons.schema.resolver, + org.w3c.dom, + org.xml.sax Bundle-SymbolicName: org.apache.tuscany.sca.xsd Bundle-DocURL: http://www.apache.org/ Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/java/sca/modules/xsd/pom.xml b/java/sca/modules/xsd/pom.xml index fb45d7921e..ed059d0c95 100644 --- a/java/sca/modules/xsd/pom.xml +++ b/java/sca/modules/xsd/pom.xml @@ -40,6 +40,16 @@ XmlSchema 1.4.2 + + org.apache.tuscany.sca + tuscany-contribution + 2.0-SNAPSHOT + + + org.apache.tuscany.sca + tuscany-contribution-namespace + 2.0-SNAPSHOT + diff --git a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java new file mode 100644 index 0000000000..a057bbe155 --- /dev/null +++ b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java @@ -0,0 +1,184 @@ +/* + * 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.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URL; +import java.net.URLConnection; + +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.xml.sax.InputSource; + +/** + * @version $Rev$ $Date$ + */ +public class XMLDocumentHelper { + public static final QName WSDL11 = new QName("http://schemas.xmlsoap.org/wsdl/", "definitions"); + public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); + public static final QName WSDL20 = new QName("http://www.w3.org/ns/wsdl", "description"); + + protected static final int BUFFER_SIZE = 256; + + /** + * Detect the XML encoding of the document + * + * @param is The input stream + * @return The encoding + * @throws IOException + */ + public static String getEncoding(InputStream is) throws IOException { + if (!is.markSupported()) + is = new BufferedInputStream(is); + + byte[] buffer = readBuffer(is); + return getXMLEncoding(buffer); + } + + /** + * Searches the array of bytes to determine the XML encoding. + */ + protected static String getXMLEncoding(byte[] bytes) { + String javaEncoding = null; + + if (bytes.length >= 4) { + if (((bytes[0] == -2) && (bytes[1] == -1)) || ((bytes[0] == 0) && (bytes[1] == 60))) + javaEncoding = "UnicodeBig"; + else if (((bytes[0] == -1) && (bytes[1] == -2)) || ((bytes[0] == 60) && (bytes[1] == 0))) + javaEncoding = "UnicodeLittle"; + else if ((bytes[0] == -17) && (bytes[1] == -69) && (bytes[2] == -65)) + javaEncoding = "UTF8"; + } + + String header = null; + + try { + if (javaEncoding != null) + header = new String(bytes, 0, bytes.length, javaEncoding); + else + header = new String(bytes, 0, bytes.length); + } catch (UnsupportedEncodingException e) { + return null; + } + + if (!header.startsWith(""); + int encodingIndex = header.indexOf("encoding", 6); + + if ((encodingIndex == -1) || (encodingIndex > endOfXMLPI)) + return "UTF-8"; + + int firstQuoteIndex = header.indexOf("\"", encodingIndex); + int lastQuoteIndex; + + if ((firstQuoteIndex == -1) || (firstQuoteIndex > endOfXMLPI)) { + firstQuoteIndex = header.indexOf("'", encodingIndex); + lastQuoteIndex = header.indexOf("'", firstQuoteIndex + 1); + } else + lastQuoteIndex = header.indexOf("\"", firstQuoteIndex + 1); + + return header.substring(firstQuoteIndex + 1, lastQuoteIndex); + } + + protected static byte[] readBuffer(InputStream is) throws IOException { + if (is.available() == 0) { + return new byte[0]; + } + + byte[] buffer = new byte[BUFFER_SIZE]; + is.mark(BUFFER_SIZE); + int bytesRead = is.read(buffer, 0, BUFFER_SIZE); + int totalBytesRead = bytesRead; + + while (bytesRead != -1 && (totalBytesRead < BUFFER_SIZE)) { + bytesRead = is.read(buffer, totalBytesRead, BUFFER_SIZE - totalBytesRead); + + if (bytesRead != -1) + totalBytesRead += bytesRead; + } + + if (totalBytesRead < BUFFER_SIZE) { + byte[] smallerBuffer = new byte[totalBytesRead]; + System.arraycopy(buffer, 0, smallerBuffer, 0, totalBytesRead); + smallerBuffer = buffer; + } + + is.reset(); + return buffer; + } + + public static InputSource getInputSource(URL url) throws IOException { + URLConnection connection = url.openConnection(); + connection.setUseCaches(false); + InputStream is = connection.getInputStream(); + return getInputSource(url, is); + } + + public static InputSource getInputSource(URL url, InputStream is) throws IOException { + is = new BufferedInputStream(is); + String encoding = getEncoding(is); + InputSource inputSource = new InputSource(is); + inputSource.setEncoding(encoding); + // [rfeng] Make sure we set the system id as it will be used as the base URI for nested import/include + inputSource.setSystemId(url.toString()); + return inputSource; + } + + public static String readTargetNamespace(URL doc, QName element, boolean rootOnly, String attribute, XMLInputFactory inputFactory) + throws IOException, XMLStreamException { + if (attribute == null) { + attribute = "targetNamespace"; + } + URLConnection connection = doc.openConnection(); + connection.setUseCaches(false); + InputStream is = connection.getInputStream(); + try { + XMLStreamReader reader = inputFactory.createXMLStreamReader(is); + int eventType = reader.getEventType(); + while (true) { + if (eventType == XMLStreamConstants.START_ELEMENT) { + if (element.equals(reader.getName())) { + return reader.getAttributeValue(null, attribute); + } else if (rootOnly) { + return null; + } + } + if (reader.hasNext()) { + eventType = reader.next(); + } else { + break; + } + } + return null; + } finally { + is.close(); + } + } + +} diff --git a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java new file mode 100644 index 0000000000..1d84b6c0a0 --- /dev/null +++ b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java @@ -0,0 +1,101 @@ +/* + * 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.net.URI; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLInputFactory; + +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.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 XSD documents. + * + * @version $Rev$ $Date$ + */ +public class XSDDocumentProcessor implements URLArtifactProcessor { + + private XSDFactory factory; + private XMLInputFactory inputFactory; + private Monitor monitor; + + public XSDDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) { + this.factory = 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(), "xsd-xml-validation-messages", Severity.ERROR, model, message, ex); + monitor.problem(problem); + } + } + + public XSDefinition read(URL contributionURL, URI artifactURI, URL artifactURL) throws ContributionReadException { + try { + return indexRead(artifactURL); + } catch (Exception e) { + ContributionReadException ce = new ContributionReadException(e); + error("ContributionReadException", artifactURL, ce); + throw ce; + } + } + + public void resolve(XSDefinition model, ModelResolver resolver) throws ContributionResolveException { + } + + public String getArtifactType() { + return ".xsd"; + } + + public Class getModelType() { + return XSDefinition.class; + } + + public static final QName XSD = new QName("http://www.w3.org/2001/XMLSchema", "schema"); + + protected XSDefinition indexRead(URL doc) throws Exception { + XSDefinition xsd = factory.createXSDefinition(); + xsd.setUnresolved(true); + xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace", inputFactory)); + xsd.setLocation(doc.toURI()); + xsd.setUnresolved(false); + return xsd; + } +} diff --git a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java new file mode 100644 index 0000000000..c30d3ebbd6 --- /dev/null +++ b/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java @@ -0,0 +1,279 @@ +/* + * 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.namespace.NamespaceImport; +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.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, FactoryExtensionPoint 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; + // Lookup a definition for the given namespace + String namespace = definition.getNamespace(); + 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 (IOException 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 IOException { + if (definition.getSchema() != null) { + return; + } + if (definition.getDocument() != null) { + String uri = null; + if (definition.getLocation() != null) { + uri = definition.getLocation().toString(); + } + XmlSchema schema = schemaCollection.read(definition.getDocument(), uri, null); + definition.setSchemaCollection(schemaCollection); + definition.setSchema(schema); + definition.setUnresolved(false); + } else if (definition.getLocation() != null) { + if (definition.getLocation().getFragment() != null) { + // It's an inline schema + return; + } + // Read an XSD document + InputSource xsd = XMLDocumentHelper.getInputSource(definition.getLocation().toURL()); + for (XmlSchema d : schemaCollection.getXmlSchemas()) { + if (d.getTargetNamespace().equals(definition.getNamespace())) { + if (d.getSourceURI().equals(definition.getLocation().toString())) + return; + } + } + XmlSchema schema = schemaCollection.read(xsd, null); + definition.setSchemaCollection(schemaCollection); + definition.setSchema(schema); + } + } + + /** + * 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 IOException { + 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 org.xml.sax.InputSource resolveEntity(java.lang.String targetNamespace, + java.lang.String schemaLocation, + java.lang.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; + } + } + } else { + url = new URL(new URL(baseUri), schemaLocation); + } + return XMLDocumentHelper.getInputSource(url); + } catch (IOException e) { + return null; + } + } + } + +} diff --git a/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor new file mode 100644 index 0000000000..1ec3d27200 --- /dev/null +++ b/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor @@ -0,0 +1,19 @@ +# 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. + +# Implementation class for the artifact processor extension +org.apache.tuscany.sca.xsd.xml.XSDDocumentProcessor;type=.xsd,model=org.apache.tuscany.sca.xsd.XSDefinition diff --git a/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver new file mode 100644 index 0000000000..a67ecf063a --- /dev/null +++ b/java/sca/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver @@ -0,0 +1,18 @@ +# 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. + +org.apache.tuscany.sca.xsd.xml.XSDModelResolver;model=org.apache.tuscany.sca.xsd.XSDefinition diff --git a/java/sca/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties b/java/sca/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties new file mode 100644 index 0000000000..ab50456510 --- /dev/null +++ b/java/sca/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties @@ -0,0 +1,23 @@ +# +# +# 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. +# +# +ContributionReadException = ContributionReadException occured due to : {0} + + diff --git a/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java b/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java new file mode 100644 index 0000000000..56831e23d3 --- /dev/null +++ b/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java @@ -0,0 +1,50 @@ +/* + * 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.net.URL; + +import javax.xml.stream.XMLInputFactory; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class XMLDocumentHelperTestCase { + private URL xsd; + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + xsd = getClass().getResource("/xsd/greeting.xsd"); + } + + @Test + public void testReadTNS() throws Exception { + String tns = XMLDocumentHelper.readTargetNamespace(xsd, XMLDocumentHelper.XSD, true, null, XMLInputFactory.newInstance()); + Assert.assertEquals("http://greeting", tns); + } + +} diff --git a/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java new file mode 100644 index 0000000000..a20d5f6f58 --- /dev/null +++ b/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java @@ -0,0 +1,89 @@ +/* + * 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.net.URI; +import java.net.URL; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; +import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; +import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.core.FactoryExtensionPoint; +import org.apache.tuscany.sca.xsd.XSDefinition; +import org.apache.ws.commons.schema.XmlSchemaInclude; +import org.apache.ws.commons.schema.XmlSchemaObjectCollection; +import org.apache.ws.commons.schema.XmlSchemaType; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +/** + * @version $Rev$ $Date$ + */ +public class XSDDocumentProcessorTestCase { + private URLArtifactProcessor documentProcessor; + private ModelResolver resolver; + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); + URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); + documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null); + FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); + resolver = new XSDModelResolver(null, modelFactories); + } + + @Test + public void testXSD() throws Exception { + URL url = getClass().getResource("/xsd/greeting.xsd"); + XSDefinition definition = (XSDefinition)documentProcessor.read(null, URI.create("xsd/greeting.xsd"), url); + Assert.assertNull(definition.getSchema()); + Assert.assertEquals("http://greeting", definition.getNamespace()); + URL url1 = getClass().getResource("/xsd/name.xsd"); + XSDefinition definition1 = (XSDefinition)documentProcessor.read(null, URI.create("xsd/name.xsd"), url1); + Assert.assertNull(definition1.getSchema()); + Assert.assertEquals("http://greeting", definition1.getNamespace()); + resolver.addModel(definition); + XSDefinition resolved = resolver.resolveModel(XSDefinition.class, definition); + XmlSchemaObjectCollection collection = resolved.getSchema().getIncludes(); + Assert.assertTrue(collection.getCount() == 1); + XmlSchemaType type = + ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name")); + Assert.assertNotNull(type); + resolver.addModel(definition1); + resolved = resolver.resolveModel(XSDefinition.class, definition); + collection = resolved.getSchema().getIncludes(); + Assert.assertTrue(collection.getCount() == 2); + XmlSchemaType type1 = + ((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name")); + XmlSchemaType type2 = + ((XmlSchemaInclude)collection.getItem(1)).getSchema().getTypeByName(new QName("http://greeting", "Name")); + Assert.assertTrue(type1 != null || type2 != null); + } + +} diff --git a/java/sca/modules/xsd/src/test/resources/xsd/greeting.xsd b/java/sca/modules/xsd/src/test/resources/xsd/greeting.xsd new file mode 100644 index 0000000000..635ca25bfc --- /dev/null +++ b/java/sca/modules/xsd/src/test/resources/xsd/greeting.xsd @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/java/sca/modules/xsd/src/test/resources/xsd/name.xsd b/java/sca/modules/xsd/src/test/resources/xsd/name.xsd new file mode 100644 index 0000000000..300de931ec --- /dev/null +++ b/java/sca/modules/xsd/src/test/resources/xsd/name.xsd @@ -0,0 +1,29 @@ + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3