mrglavas    2005/05/03 20:56:45

  Modified:    java/src/org/apache/xerces/parsers SAXParser.java
                        org.apache.xerces.xni.parser.XMLParserConfiguration
                        XMLGrammarCachingConfiguration.java
                        SecurityConfiguration.java DOMParserImpl.java
                        DOMParser.java
  Log:
  Upgrade default parser configuration to XIncludeAwareParserConfiguration.
  
  Revision  Changes    Path
  1.39      +3 -3      
xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java
  
  Index: SAXParser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/SAXParser.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- SAXParser.java    24 Feb 2004 23:15:57 -0000      1.38
  +++ SAXParser.java    4 May 2005 03:56:45 -0000       1.39
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2000-2004 The Apache Software Foundation.
  + * Copyright 2000-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.
  @@ -97,7 +97,7 @@
       public SAXParser(SymbolTable symbolTable, XMLGrammarPool grammarPool) {
           super((XMLParserConfiguration)ObjectFactory.createObject(
               "org.apache.xerces.xni.parser.XMLParserConfiguration",
  -            "org.apache.xerces.parsers.XML11Configuration"
  +            "org.apache.xerces.parsers.XIncludeAwareParserConfiguration"
               ));
   
           // set features
  
  
  
  1.6       +1 -1      
xml-xerces/java/src/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration
  
  Index: org.apache.xerces.xni.parser.XMLParserConfiguration
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- org.apache.xerces.xni.parser.XMLParserConfiguration       3 Mar 2003 
22:17:17 -0000       1.5
  +++ org.apache.xerces.xni.parser.XMLParserConfiguration       4 May 2005 
03:56:45 -0000       1.6
  @@ -1 +1 @@
  -org.apache.xerces.parsers.XML11Configuration
  +org.apache.xerces.parsers.XIncludeAwareParserConfiguration
  
  
  
  1.18      +3 -3      
xml-xerces/java/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java
  
  Index: XMLGrammarCachingConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/XMLGrammarCachingConfiguration.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLGrammarCachingConfiguration.java       25 Mar 2004 04:03:23 -0000      
1.17
  +++ XMLGrammarCachingConfiguration.java       4 May 2005 03:56:45 -0000       
1.18
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-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,7 +61,7 @@
    * @version $Id$
    */
   public class XMLGrammarCachingConfiguration 
  -    extends XML11Configuration {
  +    extends XIncludeAwareParserConfiguration {
   
       //
       // Constants
  
  
  
  1.6       +3 -3      
xml-xerces/java/src/org/apache/xerces/parsers/SecurityConfiguration.java
  
  Index: SecurityConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/SecurityConfiguration.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SecurityConfiguration.java        24 Feb 2004 23:15:57 -0000      1.5
  +++ SecurityConfiguration.java        4 May 2005 03:56:45 -0000       1.6
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-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.
  @@ -42,7 +42,7 @@
    *
    * @version $Id$
    */
  -public class SecurityConfiguration extends XML11Configuration
  +public class SecurityConfiguration extends XIncludeAwareParserConfiguration
   {
   
       //
  
  
  
  1.30      +4 -4      
xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java
  
  Index: DOMParserImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DOMParserImpl.java        2 May 2005 22:00:13 -0000       1.29
  +++ DOMParserImpl.java        4 May 2005 03:56:45 -0000       1.30
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2000-2004 The Apache Software Foundation.
  + * Copyright 2000-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.
  @@ -229,7 +229,7 @@
           this (
           (XMLParserConfiguration) ObjectFactory.createObject (
           "org.apache.xerces.xni.parser.XMLParserConfiguration",
  -        "org.apache.xerces.parsers.XML11Configuration"));
  +        "org.apache.xerces.parsers.XIncludeAwareParserConfiguration"));
           fConfiguration.setProperty (
           Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY,
           symbolTable);
  @@ -244,7 +244,7 @@
           this (
           (XMLParserConfiguration) ObjectFactory.createObject (
           "org.apache.xerces.xni.parser.XMLParserConfiguration",
  -        "org.apache.xerces.parsers.XML11Configuration"));
  +        "org.apache.xerces.parsers.XIncludeAwareParserConfiguration"));
           fConfiguration.setProperty (
           Constants.XERCES_PROPERTY_PREFIX + Constants.SYMBOL_TABLE_PROPERTY,
           symbolTable);
  
  
  
  1.74      +2 -2      
xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java
  
  Index: DOMParser.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParser.java,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- DOMParser.java    2 May 2005 21:44:18 -0000       1.73
  +++ DOMParser.java    4 May 2005 03:56:45 -0000       1.74
  @@ -123,7 +123,7 @@
       public DOMParser(SymbolTable symbolTable, XMLGrammarPool grammarPool) {
           super((XMLParserConfiguration)ObjectFactory.createObject(
               "org.apache.xerces.xni.parser.XMLParserConfiguration",
  -            "org.apache.xerces.parsers.XML11Configuration"
  +            "org.apache.xerces.parsers.XIncludeAwareParserConfiguration"
               ));
   
           // set properties
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to