You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ws.apache.org by di...@apache.org on 2005/10/25 19:09:09 UTC

svn commit: r328425 - /webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java

Author: dims
Date: Tue Oct 25 10:09:06 2005
New Revision: 328425

URL: http://svn.apache.org/viewcvs?rev=328425&view=rev
Log:
Fix Problem #3 reported here by woden folks:
http://mail-archives.apache.org/mod_mbox/ws-woden-dev/200510.mbox/browser


Modified:
    webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java

Modified: webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java?rev=328425&r1=328424&r2=328425&view=diff
==============================================================================
--- webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java (original)
+++ webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java Tue Oct 25 10:09:06 2005
@@ -24,6 +24,7 @@
 import org.apache.ws.commons.schema.utils.XDOMUtil;
 import org.apache.ws.commons.schema.utils.Tokenizer;
 import org.apache.ws.commons.schema.constants.Constants;
+import org.xml.sax.InputSource;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.namespace.QName;
@@ -1823,17 +1824,7 @@
     }
 
     XmlSchema getXmlSchemaFromLocation(String schemaLocation) {
-        try {
-            XmlSchema s = new XmlSchema(collection);
-            java.net.URL u = new java.net.URL(schemaLocation);
-            java.io.InputStream uStream = u.openConnection().getInputStream();
-            java.io.InputStreamReader readerS =
-                    new java.io.InputStreamReader(uStream);
-
-            s = collection.read(readerS, null);
-            return s;
-        } catch (java.io.IOException e) {
-            throw new XmlSchemaException(e.getMessage());
-        }
+        XmlSchema s = collection.read(new InputSource(schemaLocation), null);
+        return s;
     }
 }