svn commit: r945557 - in /tuscany/sca-java-2.x/trunk/modules/common-xml: META-INF/MANIFEST.MF src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java

[ed...@apache.org]

Author: edwardsmj
Date: Tue May 18 09:33:19 2010
New Revision: 945557

URL: http://svn.apache.org/viewvc?rev=945557&view=rev
Log:
Updating createXMLStreamReader(URL) to use a StreamSource in its implementation, so that the scanning of external files such as DTDs is possible, as described in TUSCANY-3559

Modified:
    tuscany/sca-java-2.x/trunk/modules/common-xml/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java

Modified: tuscany/sca-java-2.x/trunk/modules/common-xml/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/common-xml/META-INF/MANIFEST.MF?rev=945557&r1=945556&r2=945557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/common-xml/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/common-xml/META-INF/MANIFEST.MF Tue May 18 09:33:19 2010
@@ -29,7 +29,8 @@ Import-Package: javax.xml.datatype,
  org.xml.sax.helpers
 Bundle-SymbolicName: org.apache.tuscany.sca.common.xml
 Bundle-DocURL: http://www.apache.org/
-Export-Package: org.apache.tuscany.sca.common.xml;version="2.0.0";uses:="org.xml.sax",
+Export-Package: org.apache.tuscany.sca.common.xml;version="2.0.0";
+  uses:="org.xml.sax",
  org.apache.tuscany.sca.common.xml.dom;version="2.0.0";
   uses:="org.xml.sax.ext,
    javax.xml.transform,

Modified: tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java?rev=945557&r1=945556&r2=945557&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java Tue May 18 09:33:19 2010
@@ -44,6 +44,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
 
 import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
 import org.apache.tuscany.sca.common.xml.stax.impl.StAX2SAXAdapter;
@@ -134,7 +135,10 @@ public class StAXHelper {
 
     public XMLStreamReader createXMLStreamReader(URL url) throws XMLStreamException {
         try {
-            return createXMLStreamReader(openStream(url));
+        	// Set up a StreamSource from the url, since this has an associated URL that
+            // can be used by the parser to find references to other files such as DTDs
+            StreamSource scdlSource = new StreamSource( openStream(url), url.toString() );
+            return inputFactory.createXMLStreamReader(scdlSource);
         } catch (IOException e) {
             throw new XMLStreamException(e);
         }