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 2005/05/09 02:38:01 UTC
cvs commit: xml-xerces/java/samples/dom Counter.java GetElementsByTagName.java Writer.java
mrglavas 2005/05/08 17:38:01
Modified: java/samples/dom Counter.java GetElementsByTagName.java
Writer.java
Log:
Updating DOM samples for XInclude features.
Revision Changes Path
1.12 +67 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Counter.java 16 Dec 2004 03:56:03 -0000 1.11
+++ Counter.java 9 May 2005 00:38:01 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
import org.w3c.dom.Text;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.SAXParseException;
/**
@@ -73,6 +75,15 @@
/** 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";
+
+ /** XInclude feature id (http://apache.org/xml/features/xinclude). */
+ protected static final String XINCLUDE_FEATURE_ID = "http://apache.org/xml/features/xinclude";
+
+ /** XInclude fixup base URIs feature id (http://apache.org/xml/features/xinclude/fixup-base-uris). */
+ protected static final String XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-base-uris";
+
+ /** XInclude fixup language feature id (http://apache.org/xml/features/xinclude/fixup-language). */
+ protected static final String XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-language";
// default settings
@@ -99,6 +110,15 @@
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
+
+ /** Default XInclude processing support (false). */
+ protected static final boolean DEFAULT_XINCLUDE = false;
+
+ /** Default XInclude fixup base URIs support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_BASE_URIS = true;
+
+ /** Default XInclude fixup language support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_LANGUAGE = true;
//
// Data
@@ -248,6 +268,9 @@
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
+ boolean xincludeProcessing = DEFAULT_XINCLUDE;
+ boolean xincludeFixupBaseURIs = DEFAULT_XINCLUDE_FIXUP_BASE_URIS;
+ boolean xincludeFixupLanguage = DEFAULT_XINCLUDE_FIXUP_LANGUAGE;
// process arguments
for (int i = 0; i < argv.length; i++) {
@@ -314,6 +337,18 @@
dynamicValidation = option.equals("dv");
continue;
}
+ if (option.equalsIgnoreCase("xi")) {
+ xincludeProcessing = option.equals("xi");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xb")) {
+ xincludeFixupBaseURIs = option.equals("xb");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xl")) {
+ xincludeFixupLanguage = option.equals("xl");
+ continue;
+ }
if (option.equals("h")) {
printUsage();
continue;
@@ -370,6 +405,24 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID, xincludeFixupLanguage);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
+ }
// parse file
try {
@@ -437,6 +490,12 @@
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(" -xi | -XI Turn on/off XInclude processing.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -xb | -XB Turn on/off base URI fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi and not supported by all parsers.");
+ System.err.println(" -xl | -XL Turn on/off language fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi and not supported by all parsers.");
System.err.println(" -h This help screen.");
System.err.println();
@@ -453,6 +512,12 @@
System.err.println(DEFAULT_SCHEMA_FULL_CHECKING ? "on" : "off");
System.err.print(" Dynamic: ");
System.err.println(DEFAULT_DYNAMIC_VALIDATION ? "on" : "off");
+ System.err.print(" XInclude: ");
+ System.err.println(DEFAULT_XINCLUDE ? "on" : "off");
+ System.err.print(" XInclude base URI fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_BASE_URIS ? "on" : "off");
+ System.err.print(" XInclude language fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_LANGUAGE ? "on" : "off");
} // printUsage()
1.11 +68 -5 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GetElementsByTagName.java 16 Dec 2004 03:56:03 -0000 1.10
+++ GetElementsByTagName.java 9 May 2005 00:38:01 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2002,2004 The Apache Software Foundation.
+ * Copyright 1999-2002,2004,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,6 +61,15 @@
/** 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";
+
+ /** XInclude feature id (http://apache.org/xml/features/xinclude). */
+ protected static final String XINCLUDE_FEATURE_ID = "http://apache.org/xml/features/xinclude";
+
+ /** XInclude fixup base URIs feature id (http://apache.org/xml/features/xinclude/fixup-base-uris). */
+ protected static final String XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-base-uris";
+
+ /** XInclude fixup language feature id (http://apache.org/xml/features/xinclude/fixup-language). */
+ protected static final String XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-language";
// default settings
@@ -87,6 +96,15 @@
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
+
+ /** Default XInclude processing support (false). */
+ protected static final boolean DEFAULT_XINCLUDE = false;
+
+ /** Default XInclude fixup base URIs support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_BASE_URIS = true;
+
+ /** Default XInclude fixup language support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_LANGUAGE = true;
//
// Public static methods
@@ -219,6 +237,9 @@
boolean schemaFullChecking = DEFAULT_SCHEMA_FULL_CHECKING;
boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
+ boolean xincludeProcessing = DEFAULT_XINCLUDE;
+ boolean xincludeFixupBaseURIs = DEFAULT_XINCLUDE_FIXUP_BASE_URIS;
+ boolean xincludeFixupLanguage = DEFAULT_XINCLUDE_FIXUP_LANGUAGE;
// process arguments
for (int i = 0; i < argv.length; i++) {
@@ -280,6 +301,18 @@
dynamicValidation = option.equals("dv");
continue;
}
+ if (option.equalsIgnoreCase("xi")) {
+ xincludeProcessing = option.equals("xi");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xb")) {
+ xincludeFixupBaseURIs = option.equals("xb");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xl")) {
+ xincludeFixupLanguage = option.equals("xl");
+ continue;
+ }
if (option.equals("h")) {
printUsage();
continue;
@@ -336,6 +369,24 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID, xincludeFixupLanguage);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
+ }
// parse file
try {
@@ -383,22 +434,34 @@
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(" -xi | -XI Turn on/off XInclude processing.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -xb | -XB Turn on/off base URI fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi and not supported by all parsers.");
+ System.err.println(" -xl | -XL Turn on/off language fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi and not supported by all parsers.");
System.err.println(" -h This help screen.");
System.err.println();
System.err.println("defaults:");
System.err.println(" Parser: "+DEFAULT_PARSER_NAME);
System.err.println(" Element: "+DEFAULT_ELEMENT_NAME);
- System.out.print(" Namespaces: ");
+ System.err.print(" Namespaces: ");
System.err.println(DEFAULT_NAMESPACES ? "on" : "off");
- System.out.print(" Validation: ");
+ System.err.print(" Validation: ");
System.err.println(DEFAULT_VALIDATION ? "on" : "off");
- System.out.print(" Schema: ");
+ 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(" XInclude: ");
+ System.err.println(DEFAULT_XINCLUDE ? "on" : "off");
+ System.err.print(" XInclude base URI fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_BASE_URIS ? "on" : "off");
+ System.err.print(" XInclude language fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_LANGUAGE ? "on" : "off");
} // printUsage()
1.16 +64 -1 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Writer.java 5 Jan 2005 00:34:40 -0000 1.15
+++ Writer.java 9 May 2005 00:38:01 -0000 1.16
@@ -69,6 +69,15 @@
/** 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";
+
+ /** XInclude feature id (http://apache.org/xml/features/xinclude). */
+ protected static final String XINCLUDE_FEATURE_ID = "http://apache.org/xml/features/xinclude";
+
+ /** XInclude fixup base URIs feature id (http://apache.org/xml/features/xinclude/fixup-base-uris). */
+ protected static final String XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-base-uris";
+
+ /** XInclude fixup language feature id (http://apache.org/xml/features/xinclude/fixup-language). */
+ protected static final String XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID = "http://apache.org/xml/features/xinclude/fixup-language";
// default settings
@@ -98,6 +107,15 @@
/** Default dynamic validation support (false). */
protected static final boolean DEFAULT_DYNAMIC_VALIDATION = false;
+
+ /** Default XInclude processing support (false). */
+ protected static final boolean DEFAULT_XINCLUDE = false;
+
+ /** Default XInclude fixup base URIs support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_BASE_URIS = true;
+
+ /** Default XInclude fixup language support (true). */
+ protected static final boolean DEFAULT_XINCLUDE_FIXUP_LANGUAGE = true;
/** Default canonical output (false). */
protected static final boolean DEFAULT_CANONICAL = false;
@@ -460,6 +478,9 @@
boolean validateAnnotations = DEFAULT_VALIDATE_ANNOTATIONS;
boolean generateSyntheticAnnotations = DEFAULT_GENERATE_SYNTHETIC_ANNOTATIONS;
boolean dynamicValidation = DEFAULT_DYNAMIC_VALIDATION;
+ boolean xincludeProcessing = DEFAULT_XINCLUDE;
+ boolean xincludeFixupBaseURIs = DEFAULT_XINCLUDE_FIXUP_BASE_URIS;
+ boolean xincludeFixupLanguage = DEFAULT_XINCLUDE_FIXUP_LANGUAGE;
boolean canonical = DEFAULT_CANONICAL;
// process arguments
@@ -516,6 +537,18 @@
dynamicValidation = option.equals("dv");
continue;
}
+ if (option.equalsIgnoreCase("xi")) {
+ xincludeProcessing = option.equals("xi");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xb")) {
+ xincludeFixupBaseURIs = option.equals("xb");
+ continue;
+ }
+ if (option.equalsIgnoreCase("xl")) {
+ xincludeFixupLanguage = option.equals("xl");
+ continue;
+ }
if (option.equalsIgnoreCase("c")) {
canonical = option.equals("c");
continue;
@@ -588,6 +621,24 @@
catch (SAXException e) {
System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
}
+ try {
+ parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
+ }
+ try {
+ parser.setFeature(XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID, xincludeFixupLanguage);
+ }
+ catch (SAXException e) {
+ System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
+ }
// setup writer
if (writer == null) {
@@ -650,6 +701,12 @@
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(" -xi | -XI Turn on/off XInclude processing.");
+ System.err.println(" NOTE: Not supported by all parsers.");
+ System.err.println(" -xb | -XB Turn on/off base URI fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi and not supported by all parsers.");
+ System.err.println(" -xl | -XL Turn on/off language fixup during XInclude processing.");
+ System.err.println(" NOTE: Requires use of -xi 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.");
@@ -675,6 +732,12 @@
System.err.println(DEFAULT_VALIDATE_ANNOTATIONS ? "on" : "off");
System.err.print(" Generate Synthetic Annotations: ");
System.err.println(DEFAULT_GENERATE_SYNTHETIC_ANNOTATIONS ? "on" : "off");
+ System.err.print(" XInclude: ");
+ System.err.println(DEFAULT_XINCLUDE ? "on" : "off");
+ System.err.print(" XInclude base URI fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_BASE_URIS ? "on" : "off");
+ System.err.print(" XInclude language fixup: ");
+ System.err.println(DEFAULT_XINCLUDE_FIXUP_LANGUAGE ? "on" : "off");
} // printUsage()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org