mrglavas 2005/06/20 14:13:59
Modified: java/src/org/apache/xerces/jaxp JAXPValidatorComponent.java
Log:
Use XMLEntityManager for entity resolution.
Revision Changes Path
1.2 +22 -10
xml-xerces/java/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java
Index: JAXPValidatorComponent.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/JAXPValidatorComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JAXPValidatorComponent.java 20 Jun 2005 19:02:00 -0000 1.1
+++ JAXPValidatorComponent.java 20 Jun 2005 21:13:59 -0000 1.2
@@ -82,6 +82,18 @@
class JAXPValidatorComponent
extends TeeXMLDocumentFilterImpl implements XMLComponent {
+ /** Property identifier: entity manager. */
+ private static final String ENTITY_MANAGER =
+ Constants.XERCES_PROPERTY_PREFIX +
Constants.ENTITY_MANAGER_PROPERTY;
+
+ /** Property identifier: error reporter. */
+ private static final String ERROR_REPORTER =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.ERROR_REPORTER_PROPERTY;
+
+ /** Property identifier: symbol table. */
+ private static final String SYMBOL_TABLE =
+ Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY;
+
// pipeline parts
private final ValidatorHandler validator;
private final XNI2SAX xni2sax = new XNI2SAX();
@@ -137,7 +149,7 @@
if(fEntityResolver==null) return null;
try {
XMLInputSource is = fEntityResolver.resolveEntity(
- new
XMLResourceIdentifierImpl(publicId,systemId,baseUri,systemId));
+ new
XMLResourceIdentifierImpl(publicId,systemId,baseUri,null));
if(is==null) return null;
LSInput di = new DOMInputImpl();
@@ -193,11 +205,14 @@
public void reset(XMLComponentManager componentManager) throws
XMLConfigurationException {
// obtain references from the manager
- fSymbolTable = (SymbolTable)componentManager.getProperty(
- Constants.XERCES_PROPERTY_PREFIX +
Constants.SYMBOL_TABLE_PROPERTY);
-
- fErrorReporter = (XMLErrorReporter)componentManager.getProperty(
- Constants.XERCES_PROPERTY_PREFIX +
Constants.ERROR_REPORTER_PROPERTY);
+ fSymbolTable =
(SymbolTable)componentManager.getProperty(SYMBOL_TABLE);
+ fErrorReporter =
(XMLErrorReporter)componentManager.getProperty(ERROR_REPORTER);
+ try {
+ fEntityResolver = (XMLEntityResolver)
componentManager.getProperty(ENTITY_MANAGER);
+ }
+ catch (XMLConfigurationException e) {
+ fEntityResolver = null;
+ }
}
/**
@@ -563,13 +578,10 @@
}
public String[] getRecognizedProperties() {
- return new String[]{Constants.XERCES_PROPERTY_PREFIX +
Constants.ENTITY_RESOLVER_PROPERTY};
+ return new String[]{ENTITY_MANAGER, ERROR_REPORTER, SYMBOL_TABLE};
}
public void setProperty(String propertyId, Object value) throws
XMLConfigurationException {
- if(propertyId.equals(Constants.XERCES_PROPERTY_PREFIX +
Constants.ENTITY_RESOLVER_PROPERTY)) {
- fEntityResolver = (XMLEntityResolver)value;
- }
}
public Boolean getFeatureDefault(String featureId) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
