Improve the XML schema validation to enable XSDs in other modules

Fix an issue to write to XMLStreamWriter from SUN JDK 1.6


git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@802988 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 11 insertions, 237 deletions

diff --git a/java/sca/modules/xsd/META-INF/MANIFEST.MF b/java/sca/modules/xsd/META-INF/MANIFEST.MF
index f88a2e4ad3..ab10d33283 100644
--- a/java/sca/modules/xsd/META-INF/MANIFEST.MF
+++ b/java/sca/modules/xsd/META-INF/MANIFEST.MF
@@ -29,6 +29,8 @@ Bundle-Description: Apache Tuscany SCA XSD Model
 Import-Package: javax.xml.namespace,

  javax.xml.stream,

  org.apache.tuscany.sca.assembly;version="2.0.0",

+ org.apache.tuscany.sca.common.xml;version="2.0.0",

+ org.apache.tuscany.sca.common.xml.stax;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",

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
deleted file mode 100644
index a057bbe155..0000000000
--- a/java/sca/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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("<?xml"))
-            return "UTF-8";
-
-        int endOfXMLPI = header.indexOf("?>");
-        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
index 1d84b6c0a0..c7e07fbe60 100644
--- 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
@@ -25,10 +25,13 @@ import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
 
+import org.apache.tuscany.sca.common.xml.stax.StAXHelper;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
@@ -42,15 +45,17 @@ import org.apache.tuscany.sca.xsd.XSDefinition;
  * @version $Rev$ $Date$
  */
 public class XSDDocumentProcessor implements URLArtifactProcessor<XSDefinition> {
-
+    private StAXHelper helper;
     private XSDFactory factory;
     private XMLInputFactory inputFactory;
     private Monitor monitor;
 
-    public XSDDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
+    public XSDDocumentProcessor(ExtensionPointRegistry registry, StAXArtifactProcessor processor, Monitor monitor) {
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
         this.factory = modelFactories.getFactory(XSDFactory.class);
         this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
         this.monitor = monitor;
+        this.helper = StAXHelper.getInstance(registry);
     }
     
     /**
@@ -93,7 +98,7 @@ public class XSDDocumentProcessor implements URLArtifactProcessor<XSDefinition>
     protected XSDefinition indexRead(URL doc) throws Exception {
         XSDefinition xsd = factory.createXSDefinition();
         xsd.setUnresolved(true);
-        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace", inputFactory));
+        xsd.setNamespace(helper.readAttribute(doc, XSD, "targetNamespace"));
         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
index f9f91202ba..8a99ffb922 100644
--- 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
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.tuscany.sca.common.xml.XMLDocumentHelper;
 import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.DefaultImport;
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
deleted file mode 100644
index 56831e23d3..0000000000
--- a/java/sca/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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);
-    }
-
-}