You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2010/05/27 21:06:12 UTC
svn commit: r948952 -
/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
Author: mrglavas
Date: Thu May 27 19:06:12 2010
New Revision: 948952
URL: http://svn.apache.org/viewvc?rev=948952&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/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
Modified: xerces/java/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java?rev=948952&r1=948951&r2=948952&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/jaxp/validation/XMLSchemaValidatorComponentManager.java Thu May 27 19:06:12 2010
@@ -83,6 +83,22 @@ final class XMLSchemaValidatorComponentM
private static final String IDENTITY_CONSTRAINT_CHECKING =
Constants.XERCES_FEATURE_PREFIX + Constants.IDC_CHECKING_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. */
@@ -226,6 +242,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: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org