neilg 2003/01/23 11:39:13
Modified: java/samples/xni Counter.java DocumentTracer.java
Writer.java xerces.properties
XMLGrammarBuilder.java
java/src/org/apache/xerces/parsers DOMBuilderImpl.java
DOMParser.java
org.apache.xerces.xni.parser.XMLParserConfiguration
SAXParser.java SecurityConfiguration.java
Log:
pull back recognition of XML 1.1 documents by default. The performance of the code
implementing this behaviour appeared to be unacceptable.
Revision Changes Path
1.11 +4 -4 xml-xerces/java/samples/xni/Counter.java
Index: Counter.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Counter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Counter.java 22 Jan 2003 16:46:16 -0000 1.10
+++ Counter.java 23 Jan 2003 19:39:11 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001, 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -124,9 +124,9 @@
// default settings
- /** Default parser configuration
(org.apache.xerces.parsers.XML11Configuration). */
+ /** Default parser configuration
(org.apache.xerces.parsers.IntegratedParserConfiguration). */
protected static final String DEFAULT_PARSER_CONFIG =
- "org.apache.xerces.parsers.XML11Configuration";
+ "org.apache.xerces.parsers.IntegratedParserConfiguration";
/** Default repetition (1). */
protected static final int DEFAULT_REPETITION = 1;
1.22 +4 -4 xml-xerces/java/samples/xni/DocumentTracer.java
Index: DocumentTracer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/DocumentTracer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DocumentTracer.java 22 Jan 2003 16:46:16 -0000 1.21
+++ DocumentTracer.java 23 Jan 2003 19:39:11 -0000 1.22
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -123,9 +123,9 @@
// default settings
- /** Default parser configuration
(org.apache.xerces.parsers.XML11Configuration). */
+ /** Default parser configuration
(org.apache.xerces.parsers.IntegratedParserConfiguration). */
protected static final String DEFAULT_PARSER_CONFIG =
- "org.apache.xerces.parsers.XML11Configuration";
+ "org.apache.xerces.parsers.IntegratedParserConfiguration";
/** Default namespaces support (true). */
protected static final boolean DEFAULT_NAMESPACES = true;
1.16 +4 -4 xml-xerces/java/samples/xni/Writer.java
Index: Writer.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/Writer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Writer.java 22 Jan 2003 16:46:16 -0000 1.15
+++ Writer.java 23 Jan 2003 19:39:12 -0000 1.16
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001, 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,9 +115,9 @@
// default settings
- /** Default parser configuration
(org.apache.xerces.parsers.XML11Configuration). */
+ /** Default parser configuration
(org.apache.xerces.parsers.IntegratedParserConfiguration). */
protected static final String DEFAULT_PARSER_CONFIG =
- "org.apache.xerces.parsers.XML11Configuration";
+ "org.apache.xerces.parsers.IntegratedParserConfiguration";
/** Default namespaces support (true). */
protected static final boolean DEFAULT_NAMESPACES = true;
1.3 +2 -2 xml-xerces/java/samples/xni/xerces.properties
Index: xerces.properties
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/xerces.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xerces.properties 22 Jan 2003 16:46:16 -0000 1.2
+++ xerces.properties 23 Jan 2003 19:39:12 -0000 1.3
@@ -88,5 +88,5 @@
# the currently-recommended default configuration; if you know
# which configuration you want, you may substitute that class
# name for what we've provided here.
-org.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XML11Configuration
+org.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.IntegratedParserConfiguration
1.6 +4 -4 xml-xerces/java/samples/xni/XMLGrammarBuilder.java
Index: XMLGrammarBuilder.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/samples/xni/XMLGrammarBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLGrammarBuilder.java 22 Jan 2003 16:46:16 -0000 1.5
+++ XMLGrammarBuilder.java 23 Jan 2003 19:39:12 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@
package xni;
import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.parsers.XML11Configuration;
+import org.apache.xerces.parsers.IntegratedParserConfiguration;
import org.apache.xerces.util.ObjectFactory;
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.util.XMLGrammarPoolImpl;
@@ -284,7 +284,7 @@
// Now we have a grammar pool and a SymbolTable; just
// build a configuration and we're on our way!
if(parserConfiguration == null) {
- parserConfiguration = new XML11Configuration(sym, grammarPool);
+ parserConfiguration = new IntegratedParserConfiguration(sym,
grammarPool);
} else {
// set GrammarPool and SymbolTable...
parserConfiguration.setProperty(SYMBOL_TABLE, sym);
1.31 +2 -2
xml-xerces/java/src/org/apache/xerces/parsers/DOMBuilderImpl.java
Index: DOMBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMBuilderImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DOMBuilderImpl.java 23 Jan 2003 19:28:09 -0000 1.30
+++ DOMBuilderImpl.java 23 Jan 2003 19:39:13 -0000 1.31
@@ -218,7 +218,7 @@
this(
(XMLParserConfiguration) ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.XML11Configuration"));
+
"org.apache.xerces.parsers.IntegratedParserConfiguration"));
fConfiguration.setProperty(
Constants.XERCES_PROPERTY_PREFIX +
Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
1.67 +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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- DOMParser.java 22 Jan 2003 16:51:41 -0000 1.66
+++ DOMParser.java 23 Jan 2003 19:39:13 -0000 1.67
@@ -152,7 +152,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.IntegratedParserConfiguration"
));
// set properties
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- org.apache.xerces.xni.parser.XMLParserConfiguration 22 Jan 2003 16:51:41
-0000 1.3
+++ org.apache.xerces.xni.parser.XMLParserConfiguration 23 Jan 2003 19:39:13
-0000 1.4
@@ -1 +1 @@
-org.apache.xerces.parsers.XML11Configuration
+org.apache.xerces.parsers.IntegratedParserConfiguration
1.35 +2 -2 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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SAXParser.java 22 Jan 2003 16:51:41 -0000 1.34
+++ SAXParser.java 23 Jan 2003 19:39:13 -0000 1.35
@@ -139,7 +139,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.IntegratedParserConfiguration"
));
// set features
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityConfiguration.java 22 Jan 2003 16:51:41 -0000 1.2
+++ SecurityConfiguration.java 23 Jan 2003 19:39:13 -0000 1.3
@@ -83,7 +83,7 @@
*
* @version $Id$
*/
-public class SecurityConfiguration extends XML11Configuration
+public class SecurityConfiguration extends IntegratedParserConfiguration
{
//
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
