Author: bimargulies
Date: Sat Nov 15 19:01:29 2008
New Revision: 717968
URL: http://svn.apache.org/viewvc?rev=717968&view=rev
Log:
WSCOMMONS-364.
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java?rev=717968&r1=717967&r2=717968&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/SchemaBuilder.java
Sat Nov 15 19:01:29 2008
@@ -1863,7 +1863,7 @@
//use the entity resolver provided if the schema location is
present null
if (schemaLocation != null && !"".equals(schemaLocation)) {
- InputSource source =
collection.schemaResolver.resolveEntity(
+ InputSource source =
collection.getSchemaResolver().resolveEntity(
targetNamespace, schemaLocation,
baseUri);
//the entity resolver was unable to resolve this!!
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=717968&r1=717967&r2=717968&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
Sat Nov 15 19:01:29 2008
@@ -144,9 +144,9 @@
* An org.xml.sax.EntityResolver that is used to
* resolve the imports/includes
*/
- URIResolver schemaResolver = new DefaultURIResolver();
+ private URIResolver schemaResolver = new DefaultURIResolver();
- XmlSchema xsd = new XmlSchema(XmlSchema.SCHEMA_NS, this);
+ XmlSchema xsd = new XmlSchema(XmlSchema.SCHEMA_NS, this);
/**
* stack to track imports (to prevent recursion)
@@ -171,6 +171,14 @@
}
/**
+ * Retrieve the custom URI resolver, if any.
+ * @return the current resolver.
+ */
+ public URIResolver getSchemaResolver() {
+ return schemaResolver;
+ }
+
+ /**
* This section should comply to the XMLSchema specification; see
* <a
href="http://www.w3.org/TR/2004/PER-xmlschema-2-20040318/datatypes.html#built-in-datatypes";>
*
http://www.w3.org/TR/2004/PER-xmlschema-2-20040318/datatypes.html#built-in-datatypes</a>.
