xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From knoa...@apache.org
Subject svn commit: r690999 [2/2] - in /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces: impl/ impl/dv/xs/ impl/xpath/ impl/xs/ impl/xs/alternative/ jaxp/validation/ parsers/
Date Mon, 01 Sep 2008 15:40:18 GMT
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/StandardParserConfiguration.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/StandardParserConfiguration.java?rev=690999&r1=690998&r2=690999&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/StandardParserConfiguration.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/StandardParserConfiguration.java
Mon Sep  1 08:40:17 2008
@@ -120,6 +120,10 @@
     protected static final String IDENTITY_CONSTRAINT_CHECKING =
         Constants.XERCES_FEATURE_PREFIX + Constants.IDC_CHECKING_FEATURE;
 
+    /** Feature identifier: whether to ignore type alternatives errors */
+    protected static final String TYPE_ALTERNATIVES_CHECKING =
+        Constants.XERCES_FEATURE_PREFIX + Constants.TYPE_ALTERNATIVES_CHEKING_FEATURE;
+
     // property identifiers
 
     /** Property identifier: XML Schema validator. */
@@ -216,6 +220,7 @@
             ID_IDREF_CHECKING,
             IDENTITY_CONSTRAINT_CHECKING,
             UNPARSED_ENTITY_CHECKING,
+            TYPE_ALTERNATIVES_CHECKING,
         };
         addRecognizedFeatures(recognizedFeatures);
 
@@ -231,6 +236,7 @@
         setFeature(ID_IDREF_CHECKING, true);
         setFeature(IDENTITY_CONSTRAINT_CHECKING, true);
         setFeature(UNPARSED_ENTITY_CHECKING, true);
+        setFeature(TYPE_ALTERNATIVES_CHECKING, true);
 
         // add default recognized properties
     

Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/XML11Configuration.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/XML11Configuration.java?rev=690999&r1=690998&r2=690999&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/XML11Configuration.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/parsers/XML11Configuration.java
Mon Sep  1 08:40:17 2008
@@ -185,6 +185,9 @@
 	protected static final String IDENTITY_CONSTRAINT_CHECKING =
 	    Constants.XERCES_FEATURE_PREFIX + Constants.IDC_CHECKING_FEATURE;
 
+    /** Feature identifier: whether to ignore type alternatives errors */
+    protected static final String TYPE_ALTERNATIVES_CHECKING =
+        Constants.XERCES_FEATURE_PREFIX + Constants.TYPE_ALTERNATIVES_CHEKING_FEATURE;
     
 
     // property identifiers
@@ -470,6 +473,7 @@
 		        HONOUR_ALL_SCHEMALOCATIONS, IGNORE_XSI_TYPE,
 		        ID_IDREF_CHECKING, IDENTITY_CONSTRAINT_CHECKING,
 		        UNPARSED_ENTITY_CHECKING, USE_GRAMMAR_POOL_ONLY,
+		        TYPE_ALTERNATIVES_CHECKING,
 		        // NOTE: These shouldn't really be here but since the XML Schema
 		        //       validator is constructed dynamically, its recognized
 		        //       features might not have been set and it would cause a
@@ -500,6 +504,7 @@
         fFeatures.put(UNPARSED_ENTITY_CHECKING, Boolean.TRUE);
         fFeatures.put(USE_GRAMMAR_POOL_ONLY, Boolean.FALSE);
         fFeatures.put(PARSER_SETTINGS, Boolean.TRUE);
+        fFeatures.put(TYPE_ALTERNATIVES_CHECKING, Boolean.TRUE);
 
         // add default recognized properties
         final String[] recognizedProperties =



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org


Mime
View raw message