Author: mrglavas
Date: Thu May 27 19:06:34 2010
New Revision: 948953
URL: http://svn.apache.org/viewvc?rev=948953&view=rev
Log:
Fixing JIRA Issue #1142: http://issues.apache.org/jira/browse/XERCESJ-1142.
Some features were not recognized by the component manager, causing
XMLConfigurationExceptions to be thrown and silently caught during reset. This
should not occur anymore.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java?rev=948953&r1=948952&r2=948953&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
Thu May 27 19:06:34 2010
@@ -87,6 +87,22 @@ final class XMLSchemaValidatorComponentM
private static final String TYPE_ALTERNATIVES_CHECKING =
Constants.XERCES_FEATURE_PREFIX +
Constants.TYPE_ALTERNATIVES_CHEKING_FEATURE;
+ /** Feature identifier: disallow DOCTYPE declaration */
+ private static final String DISALLOW_DOCTYPE_DECL_FEATURE =
+ Constants.XERCES_FEATURE_PREFIX +
Constants.DISALLOW_DOCTYPE_DECL_FEATURE;
+
+ /** Feature identifier: expose schema normalized value */
+ private static final String NORMALIZE_DATA =
+ Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_NORMALIZED_VALUE;
+
+ /** Feature identifier: send element default value via characters() */
+ private static final String SCHEMA_ELEMENT_DEFAULT =
+ Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_ELEMENT_DEFAULT;
+
+ /** Feature identifier: augment PSVI */
+ private static final String SCHEMA_AUGMENT_PSVI =
+ Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_AUGMENT_PSVI;
+
// property identifiers
/** Property identifier: entity manager. */
@@ -235,6 +251,18 @@ final class XMLSchemaValidatorComponentM
fErrorReporter.putMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN,
new XSMessageFormatter());
// add all recognized features and properties and apply their defaults
+ final String [] recognizedFeatures = {
+ DISALLOW_DOCTYPE_DECL_FEATURE,
+ NORMALIZE_DATA,
+ SCHEMA_ELEMENT_DEFAULT,
+ SCHEMA_AUGMENT_PSVI
+ };
+ addRecognizedFeatures(recognizedFeatures);
+ fFeatures.put(DISALLOW_DOCTYPE_DECL_FEATURE, Boolean.FALSE);
+ fFeatures.put(NORMALIZE_DATA, Boolean.FALSE);
+ fFeatures.put(SCHEMA_ELEMENT_DEFAULT, Boolean.FALSE);
+ fFeatures.put(SCHEMA_AUGMENT_PSVI, Boolean.TRUE);
+
addRecognizedParamsAndSetDefaults(fEntityManager, grammarContainer);
addRecognizedParamsAndSetDefaults(fErrorReporter, grammarContainer);
addRecognizedParamsAndSetDefaults(fSchemaValidator, grammarContainer);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
