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:29:47 UTC

cvs commit: xml-xerces/java/samples/sax DocumentTracer.java Writer.java Counter.java

mrglavas    2005/05/08 17:29:47

  Modified:    java/samples/sax DocumentTracer.java Writer.java
                        Counter.java
  Log:
  Updating SAX samples for XInclude features.
  
  Revision  Changes    Path
  1.13      +78 -6     xml-xerces/java/samples/sax/DocumentTracer.java
  
  Index: DocumentTracer.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/sax/DocumentTracer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DocumentTracer.java	16 Dec 2004 03:35:43 -0000	1.12
  +++ DocumentTracer.java	9 May 2005 00:29:47 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2000-2002,2004 The Apache Software Foundation.
  + * Copyright 2000-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.
  @@ -88,6 +88,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";
   
       // property ids
   
  @@ -122,6 +131,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
  @@ -784,6 +802,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++) {
  @@ -846,6 +867,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;
  @@ -915,7 +948,7 @@
                   parser.setFeature(VALIDATE_ANNOTATIONS_ID, validateAnnotations);
               }
               catch (SAXNotRecognizedException e) {
  -                System.err.println("warning: Parser does not support feature ("+VALIDATE_ANNOTATIONS_ID+")");
  +                System.err.println("warning: Parser does not recognize feature ("+VALIDATE_ANNOTATIONS_ID+")");
               }
               catch (SAXNotSupportedException e) {
                   System.err.println("warning: Parser does not support feature ("+VALIDATE_ANNOTATIONS_ID+")");
  @@ -929,6 +962,33 @@
               catch (SAXNotSupportedException e) {
                   System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
               }
  +            try {
  +                parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
  +            }
  +            try {
  +                parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException 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 (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +            }
   
               // set handlers
               parser.setDTDHandler(tracer);
  @@ -985,13 +1045,13 @@
   
           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("  -n  | -N    Turn on/off namespace processing.");
           System.err.println("  -np | -NP   Turn on/off namespace prefixes.");
           System.err.println("              NOTE: Requires use of -n.");
  -        System.err.println("  -v | -V     Turn on/off validation.");
  +        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("  -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.");
  @@ -999,6 +1059,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();
   
  @@ -1018,6 +1084,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.16      +76 -4     xml-xerces/java/samples/sax/Writer.java
  
  Index: Writer.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/sax/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:29:47 -0000	1.16
  @@ -84,6 +84,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";
   
       // property ids
   
  @@ -121,6 +130,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;
  @@ -551,6 +569,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
  @@ -619,6 +640,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;
  @@ -716,6 +749,33 @@
               catch (SAXNotSupportedException e) {
                   System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
               }
  +            try {
  +                parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
  +            }
  +            try {
  +                parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException 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 (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +            }
               
               // setup writer
               if (writer == null) {
  @@ -773,13 +833,13 @@
   
           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("  -n  | -N    Turn on/off namespace processing.");
           System.err.println("  -np | -NP   Turn on/off namespace prefixes.");
           System.err.println("              NOTE: Requires use of -n.");
  -        System.err.println("  -v | -V     Turn on/off validation.");
  +        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("  -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.");
  @@ -789,6 +849,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.");
  @@ -816,6 +882,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()
   
  
  
  
  1.14      +82 -7     xml-xerces/java/samples/sax/Counter.java
  
  Index: Counter.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/samples/sax/Counter.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Counter.java	16 Dec 2004 03:35:43 -0000	1.13
  +++ Counter.java	9 May 2005 00:29:47 -0000	1.14
  @@ -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.
  @@ -25,10 +25,10 @@
   import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.SAXParseException;
   import org.xml.sax.XMLReader;
  -import org.xml.sax.helpers.XMLReaderFactory;
   import org.xml.sax.helpers.DefaultHandler;
   import org.xml.sax.helpers.ParserAdapter;
   import org.xml.sax.helpers.ParserFactory;
  +import org.xml.sax.helpers.XMLReaderFactory;
   
   /**
    * A sample SAX2 counter. This sample program illustrates how to
  @@ -80,6 +80,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
   
  @@ -109,6 +118,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 memory usage report (false). */
       protected static final boolean DEFAULT_MEMORY_USAGE = false;
  @@ -338,6 +356,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;
           boolean memoryUsage = DEFAULT_MEMORY_USAGE;
           boolean tagginess = DEFAULT_TAGGINESS;
   
  @@ -418,6 +439,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("m")) {
                       memoryUsage = option.equals("m");
                       continue;
  @@ -479,7 +512,7 @@
                   parser.setFeature(SCHEMA_VALIDATION_FEATURE_ID, schemaValidation);
               }
               catch (SAXNotRecognizedException e) {
  -                System.err.println("warning: Parser does not support feature ("+SCHEMA_VALIDATION_FEATURE_ID+")");
  +                System.err.println("warning: Parser does not recognize feature ("+SCHEMA_VALIDATION_FEATURE_ID+")");
   
               }
               catch (SAXNotSupportedException e) {
  @@ -489,7 +522,7 @@
                   parser.setFeature(SCHEMA_FULL_CHECKING_FEATURE_ID, schemaFullChecking);
               }
               catch (SAXNotRecognizedException e) {
  -                System.err.println("warning: Parser does not support feature ("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
  +                System.err.println("warning: Parser does not recognize feature ("+SCHEMA_FULL_CHECKING_FEATURE_ID+")");
   
               }
               catch (SAXNotSupportedException e) {
  @@ -499,7 +532,7 @@
                   parser.setFeature(VALIDATE_ANNOTATIONS_ID, validateAnnotations);
               }
               catch (SAXNotRecognizedException e) {
  -                System.err.println("warning: Parser does not support feature ("+VALIDATE_ANNOTATIONS_ID+")");
  +                System.err.println("warning: Parser does not recognize feature ("+VALIDATE_ANNOTATIONS_ID+")");
   
               }
               catch (SAXNotSupportedException e) {
  @@ -509,12 +542,42 @@
                   parser.setFeature(DYNAMIC_VALIDATION_FEATURE_ID, dynamicValidation);
               }
               catch (SAXNotRecognizedException e) {
  -                System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
  +                System.err.println("warning: Parser does not recognize feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
   
               }
               catch (SAXNotSupportedException e) {
                   System.err.println("warning: Parser does not support feature ("+DYNAMIC_VALIDATION_FEATURE_ID+")");
               }
  +            try {
  +                parser.setFeature(XINCLUDE_FEATURE_ID, xincludeProcessing);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FEATURE_ID+")");
  +
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FEATURE_ID+")");
  +            }
  +            try {
  +                parser.setFeature(XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID, xincludeFixupBaseURIs);
  +            }
  +            catch (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_BASE_URIS_FEATURE_ID+")");
  +
  +            }
  +            catch (SAXNotSupportedException 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 (SAXNotRecognizedException e) {
  +                System.err.println("warning: Parser does not recognize feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +
  +            }
  +            catch (SAXNotSupportedException e) {
  +                System.err.println("warning: Parser does not support feature ("+XINCLUDE_FIXUP_LANGUAGE_FEATURE_ID+")");
  +            }
   
               // parse file
               parser.setContentHandler(counter);
  @@ -578,6 +641,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("  -m  | -M    Turn on/off memory usage report");
           System.err.println("  -t  | -T    Turn on/off \"tagginess\" report.");
           System.err.println("  --rem text  Output user defined comment before next parse.");
  @@ -599,6 +668,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");
           System.err.print("  Memory:     ");
           System.err.println(DEFAULT_MEMORY_USAGE ? "on" : "off");
           System.err.print("  Tagginess:  ");
  
  
  

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