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/09/21 04:48:52 UTC
svn commit: r290604 - in
/webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema:
SchemaBuilder.java constants/Constants.java
Author: dims
Date: Tue Sep 20 19:48:49 2005
New Revision: 290604
URL: http://svn.apache.org/viewcvs?rev=290604&view=rev
Log:
Fix loading of j2ee_1_4.xsd
Modified:
webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/constants/Constants.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=290604&r1=290603&r2=290604&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 Sep 20 19:48:49 2005
@@ -23,6 +23,7 @@
import org.w3c.dom.Attr;
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 javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.namespace.QName;
@@ -1276,6 +1277,9 @@
if (namespaceFromEl.length > 1) {
Object result =
schema.namespaces.get(namespaceFromEl[0]);
+ if (result == null && namespaceFromEl[0].equals(Constants.XMLNS_PREFIX)) {
+ result = Constants.XMLNS_URI;
+ }
if (result == null)
throw new XmlSchemaException("No namespace found in"
+ " given ref");
Modified: webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/constants/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/constants/Constants.java?rev=290604&r1=290603&r2=290604&view=diff
==============================================================================
--- webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/constants/Constants.java (original)
+++ webservices/commons/trunk/XmlSchema/src/org/apache/ws/commons/schema/constants/Constants.java Tue Sep 20 19:48:49 2005
@@ -22,6 +22,12 @@
* Constants
*/
public class Constants {
+ public static final String XMLNS_URI =
+ "http://www.w3.org/XML/1998/namespace";
+
+ public static final String XMLNS_PREFIX =
+ "xml";
+
//
// Schema Namespaces
//