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 2003/11/29 19:07:34 UTC
cvs commit: xml-xerces/java/samples/dom Counter.java GetElementsByTagName.java Writer.java
mrglavas 2003/11/29 10:07:34
Modified: java/samples/dom Counter.java GetElementsByTagName.java
Writer.java
Log:
Add dynamic validation and load external DTD (added to Writer only) options to DOM samples.
Revision Changes Path
1.9 +22 -1 xml-xerces/java/samples/dom/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/Counter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Counter.java 13 Mar 2002 10:02:19 -0000 1.8
+++ Counter.java 29 Nov 2003 18:07:34 -0000 1.9
@@ -108,6 +108,9 @@
/** Schema full checking feature id (http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking";
+
+ /** Dynamic validation feature id (http://apache.org/xml/features/validation/dynamic). */
+ protected static final String DYNAMIC_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/dynamic";
// default settings
@@ -129,6 +132,9 @@
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+ /** Default dynamic validation support (false). */
+ protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
+
//
// Data
//
@@ -275,6 +281,7 @@
boolean validation = DEFAULT_VALIDATION;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
// process arguments
for (int i = 0; i < argv.length; i++) {
@@ -333,6 +340,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("dv")) {
+ dynamicValidation = option.equals("dv");
+ continue;
+ }
if (option.equals("h")) {
printUsage();
continue;
@@ -377,6 +388,12 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID, dynamicValidation);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
+ }
// parse file
try {
@@ -440,6 +457,8 @@
System.err.println(" NOTE: Not supported by all parsers.");
System.err.println(" -f | -F Turn on/off Schema full checking.");
System.err.println(" NOTE: Requires use of -s and not supported by all parsers.");
+ System.err.println(" -dv | -DV Turn on/off dynamic validation.");
+ System.err.println(" NOTE: Not supported by all parsers.");
System.err.println(" -h This help screen.");
System.err.println();
@@ -454,6 +473,8 @@
System.err.println(DEFAULT_SCHEMA_VALIDATION ? "on" : "off");
System.err.print(" Schema full checking: ");
System.err.println(DEFAULT_SCHEMA_FULL_CHECKING ? "on" : "off");
+ System.err.print(" Dynamic: ");
+ System.err.println(DEFAULT_DYNAMIC_VALIDATION ? "on" : "off");
} // printUsage()
1.8 +32 -11 xml-xerces/java/samples/dom/GetElementsByTagName.java
Index: GetElementsByTagName.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/GetElementsByTagName.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- GetElementsByTagName.java 10 Oct 2003 18:20:36 -0000 1.7
+++ GetElementsByTagName.java 29 Nov 2003 18:07:34 -0000 1.8
@@ -102,6 +102,9 @@
/** Schema full checking feature id (http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking";
+
+ /** Dynamic validation feature id (http://apache.org/xml/features/validation/dynamic). */
+ protected static final String DYNAMIC_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/dynamic";
// default settings
@@ -122,6 +125,9 @@
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+
+ /** Default dynamic validation support (false). */
+ protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
//
// Public static methods
@@ -252,6 +258,7 @@
boolean validation = DEFAULT_VALIDATION;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
// process arguments
for (int i = 0; i < argv.length; i++) {
@@ -305,6 +312,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("dv")) {
+ dynamicValidation = option.equals("dv");
+ continue;
+ }
if (option.equals("h")) {
printUsage();
continue;
@@ -349,6 +360,12 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID, dynamicValidation);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
+ }
// parse file
try {
@@ -383,16 +400,18 @@
System.err.println();
System.err.println("options:");
- System.err.println(" -p name Select parser by name.");
- System.err.println(" -e name Specify element name for search.");
- System.err.println(" -a name Specify attribute name for specified elements.");
- System.err.println(" -n | -N Turn on/off namespace processing.");
- System.err.println(" -v | -V Turn on/off validation.");
- System.err.println(" -s | -S Turn on/off Schema validation support.");
- System.err.println(" NOTE: Not supported by all parsers.");
- System.err.println(" -f | -F Turn on/off Schema full checking.");
- System.err.println(" NOTE: Requires use of -s and not supported by all parsers.");
- System.err.println(" -h This help screen.");
+ System.err.println(" -p name Select parser by name.");
+ System.err.println(" -e name Specify element name for search.");
+ System.err.println(" -a name Specify attribute name for specified elements.");
+ System.err.println(" -n | -N Turn on/off namespace processing.");
+ System.err.println(" -v | -V Turn on/off validation.");
+ System.err.println(" -s | -S Turn on/off Schema validation support.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -f | -F Turn on/off Schema full checking.");
+ System.err.println(" NOTE: Requires use of -s and not supported by all parsers.");
+ System.err.println(" -dv | -DV Turn on/off dynamic validation.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -h This help screen.");
System.err.println();
System.err.println("defaults:");
@@ -406,6 +425,8 @@
System.err.println(DEFAULT_SCHEMA_VALIDATION ? "on" : "off");
System.err.print(" Schema full checking: ");
System.err.println(DEFAULT_SCHEMA_FULL_CHECKING ? "on" : "off");
+ System.err.print(" Dynamic: ");
+ System.err.println(DEFAULT_DYNAMIC_VALIDATION ? "on" : "off");
} // printUsage()
1.10 +53 -16 xml-xerces/java/samples/dom/Writer.java
Index: Writer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/dom/Writer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Writer.java 10 Oct 2003 18:20:36 -0000 1.9
+++ Writer.java 29 Nov 2003 18:07:34 -0000 1.10
@@ -101,11 +101,12 @@
/** Schema full checking feature id (http://apache.org/xml/features/validation/schema-full-checking). */
protected static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking";
-
- // property ids
-
- /** Lexical handler property id (http://xml.org/sax/properties/lexical-handler). */
- protected static final String LEXICAL_HANDLER_PROPERTY_ID = "http://xml.org/sax/properties/lexical-handler";
+
+ /** Dynamic validation feature id (http://apache.org/xml/features/validation/dynamic). */
+ protected static final String DYNAMIC_VALIDATION_FEATURE_ID = "http://apache.org/xml/features/validation/dynamic";
+
+ /** Load external DTD feature id (http://apache.org/xml/features/nonvalidating/load-external-dtd). */
+ protected static final String LOAD_EXTERNAL_DTD_FEATURE_ID = "http://apache.org/xml/features/nonvalidating/load-external-dtd";
// default settings
@@ -117,12 +118,18 @@
/** Default validation support (false). */
protected static final boolean DEFAULT_VALIDATION = false;
+
+ /** Default load external DTD (true). */
+ protected static final boolean DEFAULT_LOAD_EXTERNAL_DTD = true;
/** Default Schema validation support (false). */
protected static final boolean DEFAULT_SCHEMA_VALIDATION = false;
/** Default Schema full checking support (false). */
protected static final boolean DEFAULT_SCHEMA_FULL_CHECKING = false;
+
+ /** Default dynamic validation support (false). */
+ protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
/** Default canonical output (false). */
protected static final boolean DEFAULT_CANONICAL = false;
@@ -479,8 +486,10 @@
ParserWrapper parser = null;
boolean namespaces = DEFAULT_NAMESPACES;
boolean validation = DEFAULT_VALIDATION;
+ boolean externalDTD = DEFAULT_LOAD_EXTERNAL_DTD;
boolean schemaValidation = DEFAULT_SCHEMA_VALIDATION;
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
+ boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
boolean canonical = DEFAULT_CANONICAL;
// process arguments
@@ -513,6 +522,10 @@
validation = option.equals("v");
continue;
}
+ if (option.equalsIgnoreCase("xd")) {
+ externalDTD = option.equals("xd");
+ continue;
+ }
if (option.equalsIgnoreCase("s")) {
schemaValidation = option.equals("s");
continue;
@@ -521,6 +534,10 @@
schemaFullChecking = option.equals("f");
continue;
}
+ if (option.equalsIgnoreCase("dv")) {
+ dynamicValidation = option.equals("dv");
+ continue;
+ }
if (option.equalsIgnoreCase("c")) {
canonical = option.equals("c");
continue;
@@ -558,6 +575,12 @@
System.err.println("warning: Parser does not support feature ("+VALIDATION_FEATURE_ID+")");
}
try {
+ parser.setFeature(LOAD_EXTERNAL_DTD_FEATURE_ID, externalDTD);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+LOAD_EXTERNAL_DTD_FEATURE_ID+")");
+ }
+ try {
parser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, schemaValidation);
}
catch (SAXException e) {
@@ -569,6 +592,12 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID, dynamicValidation);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
+ }
// setup writer
if (writer == null) {
@@ -616,16 +645,20 @@
System.err.println();
System.err.println("options:");
- System.err.println(" -p name Select parser by name.");
- System.err.println(" -n | -N Turn on/off namespace processing.");
- System.err.println(" -v | -V Turn on/off validation.");
- System.err.println(" -s | -S Turn on/off Schema validation support.");
- System.err.println(" NOTE: Not supported by all parsers.");
- System.err.println(" -f | -F Turn on/off Schema full checking.");
- System.err.println(" NOTE: Requires use of -s and not supported by all parsers.");
- System.err.println(" -c | -C Turn on/off Canonical XML output.");
- System.err.println(" NOTE: This is not W3C canonical output.");
- System.err.println(" -h This help screen.");
+ System.err.println(" -p name Select parser by name.");
+ System.err.println(" -n | -N Turn on/off namespace processing.");
+ System.err.println(" -v | -V Turn on/off validation.");
+ System.err.println(" -xd | -XD Turn on/off loading of external DTDs.");
+ System.err.println(" NOTE: Always on when -v in use and not supported by all parsers.");
+ System.err.println(" -s | -S Turn on/off Schema validation support.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -f | -F Turn on/off Schema full checking.");
+ System.err.println(" NOTE: Requires use of -s and not supported by all parsers.");
+ System.err.println(" -dv | -DV Turn on/off dynamic validation.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -c | -C Turn on/off Canonical XML output.");
+ System.err.println(" NOTE: This is not W3C canonical output.");
+ System.err.println(" -h This help screen.");
System.err.println();
System.err.println("defaults:");
@@ -634,10 +667,14 @@
System.err.println(DEFAULT_NAMESPACES ? "on" : "off");
System.err.print(" Validation: ");
System.err.println(DEFAULT_VALIDATION ? "on" : "off");
+ System.err.print(" Load External DTD: ");
+ System.err.println(DEFAULT_LOAD_EXTERNAL_DTD ? "on" : "off");
System.err.print(" Schema: ");
System.err.println(DEFAULT_SCHEMA_VALIDATION ? "on" : "off");
System.err.print(" Schema full checking: ");
System.err.println(DEFAULT_SCHEMA_FULL_CHECKING ? "on" : "off");
+ System.err.print(" Dynamic: ");
+ System.err.println(DEFAULT_DYNAMIC_VALIDATION ? "on" : "off");
System.err.print(" Canonical: ");
System.err.println(DEFAULT_CANONICAL ? "on" : "off");
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org