xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrgla...@apache.org
Subject svn commit: r903087 - in /xerces/java/branches/xml-schema-1.1-dev/samples/jaxp: InlineSchemaValidator.java TypeInfoWriter.java
Date Tue, 26 Jan 2010 05:41:00 GMT
Author: mrglavas
Date: Tue Jan 26 05:41:00 2010
New Revision: 903087

URL: http://svn.apache.org/viewvc?rev=903087&view=rev
Log:
Propagate the improvement that Mukul introduced in XERCESJ-1414 to the other JAXP Validation
API samples.

Modified:
    xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/InlineSchemaValidator.java
    xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/TypeInfoWriter.java

Modified: xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/InlineSchemaValidator.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/InlineSchemaValidator.java?rev=903087&r1=903086&r2=903087&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/InlineSchemaValidator.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/InlineSchemaValidator.java Tue Jan
26 05:41:00 2010
@@ -94,6 +94,9 @@
     /** Default schema language (http://www.w3.org/2001/XMLSchema). */
     protected static final String DEFAULT_SCHEMA_LANGUAGE = XMLConstants.W3C_XML_SCHEMA_NS_URI;
     
+    /** XSD 1.1 schema language (http://www.w3.org/XML/XMLSchema/v1.1). */
+    protected static final String XSD11_SCHEMA_LANGUAGE = "http://www.w3.org/XML/XMLSchema/v1.1";
+    
     /** Default repetition (1). */
     protected static final int DEFAULT_REPETITION = 1;
     
@@ -381,6 +384,10 @@
                     }
                     continue;
                 }
+                if (option.equals("xsd11")) {
+                    schemaLanguage = XSD11_SCHEMA_LANGUAGE;
+                    continue;
+                }
                 if (option.equals("x")) {
                     if (++i == argv.length) {
                         System.err.println("error: Missing argument to -x option.");
@@ -659,6 +666,7 @@
         System.err.println("  -ga | -GA        Turn on/off generation of synthetic schema
annotations.");
         System.err.println("                   NOTE: Not supported by all schema factories
and validators.");
         System.err.println("  -m  | -M         Turn on/off memory usage report");
+        System.err.println("  -xsd11           Turn on XSD 1.1 support.");
         System.err.println("  -h               This help screen.");
         
         System.err.println();

Modified: xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/TypeInfoWriter.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/TypeInfoWriter.java?rev=903087&r1=903086&r2=903087&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/TypeInfoWriter.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/jaxp/TypeInfoWriter.java Tue Jan 26 05:41:00
2010
@@ -81,6 +81,9 @@
     /** Default schema language (http://www.w3.org/2001/XMLSchema). */
     protected static final String DEFAULT_SCHEMA_LANGUAGE = XMLConstants.W3C_XML_SCHEMA_NS_URI;
     
+    /** XSD 1.1 schema language (http://www.w3.org/XML/XMLSchema/v1.1). */
+    protected static final String XSD11_SCHEMA_LANGUAGE = "http://www.w3.org/XML/XMLSchema/v1.1";
+    
     /** Default parser name (org.apache.xerces.parsers.SAXParser). */
     protected static final String DEFAULT_PARSER_NAME = "org.apache.xerces.parsers.SAXParser";
     
@@ -363,6 +366,10 @@
                     }
                     continue;
                 }
+                if (option.equals("xsd11")) {
+                    schemaLanguage = XSD11_SCHEMA_LANGUAGE;
+                    continue;
+                }
                 if (option.equals("p")) {
                     // get parser name
                     if (++i == argv.length) {
@@ -604,6 +611,7 @@
         System.err.println("              NOTE: Not supported by all schema factories and
validators.");
         System.err.println("  -ga | -GA   Turn on/off generation of synthetic schema annotations.");
         System.err.println("              NOTE: Not supported by all schema factories and
validators.");
+        System.err.println("  -xsd11      Turn on XSD 1.1 support.");
         System.err.println("  -h          This help screen.");
         
         System.err.println();



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


Mime
View raw message