sandygao 2003/03/25 09:15:16
Modified: java/src/org/apache/xerces/dom
CoreDOMImplementationImpl.java
java/src/org/apache/xerces/parsers DOMBuilderImpl.java
DOMParser.java SAXParser.java
XMLDocumentParser.java XMLGrammarParser.java
Log:
Change the default parser configuration to the one that supports XML 1.1.
Revision Changes Path
1.23 +3 -3
xml-xerces/java/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java
Index: CoreDOMImplementationImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/dom/CoreDOMImplementationImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CoreDOMImplementationImpl.java 20 Mar 2003 00:38:29 -0000 1.22
+++ CoreDOMImplementationImpl.java 25 Mar 2003 17:15:11 -0000 1.23
@@ -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
@@ -299,7 +299,7 @@
else {
// create default parser configuration validating against
XMLSchemas
return new DOMBuilderImpl(
-
"org.apache.xerces.parsers.StandardParserConfiguration",
+ "org.apache.xerces.parsers.XML11Configuration",
schemaType);
}
}
1.33 +3 -3
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- DOMBuilderImpl.java 24 Mar 2003 14:28:44 -0000 1.32
+++ DOMBuilderImpl.java 25 Mar 2003 17:15:11 -0000 1.33
@@ -220,7 +220,7 @@
this(
(XMLParserConfiguration) ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
-
"org.apache.xerces.parsers.IntegratedParserConfiguration"));
+ "org.apache.xerces.parsers.XML11Configuration"));
fConfiguration.setProperty(
Constants.XERCES_PROPERTY_PREFIX +
Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
@@ -235,7 +235,7 @@
this(
(XMLParserConfiguration) ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
-
"org.apache.xerces.parsers.StandardParserConfiguration"));
+ "org.apache.xerces.parsers.XML11Configuration"));
fConfiguration.setProperty(
Constants.XERCES_PROPERTY_PREFIX +
Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
1.68 +6 -10 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.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- DOMParser.java 23 Jan 2003 19:39:13 -0000 1.67
+++ DOMParser.java 25 Mar 2003 17:15:11 -0000 1.68
@@ -57,33 +57,29 @@
package org.apache.xerces.parsers;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.Reader;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.util.EntityResolverWrapper;
import org.apache.xerces.util.ErrorHandlerWrapper;
import org.apache.xerces.util.ObjectFactory;
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLParseException;
+import org.apache.xerces.xni.grammars.XMLGrammarPool;
import org.apache.xerces.xni.parser.XMLConfigurationException;
import org.apache.xerces.xni.parser.XMLEntityResolver;
import org.apache.xerces.xni.parser.XMLErrorHandler;
import org.apache.xerces.xni.parser.XMLInputSource;
+import org.apache.xerces.xni.parser.XMLParseException;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.apache.xerces.impl.Constants;
-
import org.w3c.dom.Node;
-
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.LocatorImpl;
/**
@@ -152,7 +148,7 @@
public DOMParser(SymbolTable symbolTable, XMLGrammarPool grammarPool) {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.IntegratedParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
// set properties
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- SAXParser.java 23 Jan 2003 19:39:13 -0000 1.35
+++ SAXParser.java 25 Mar 2003 17:15:12 -0000 1.36
@@ -57,10 +57,10 @@
package org.apache.xerces.parsers;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
import org.apache.xerces.impl.Constants;
import org.apache.xerces.util.ObjectFactory;
import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.xni.grammars.XMLGrammarPool;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
/**
@@ -139,7 +139,7 @@
public SAXParser(SymbolTable symbolTable, XMLGrammarPool grammarPool) {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.IntegratedParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
// set features
1.8 +7 -7
xml-xerces/java/src/org/apache/xerces/parsers/XMLDocumentParser.java
Index: XMLDocumentParser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/XMLDocumentParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLDocumentParser.java 3 Apr 2002 14:55:50 -0000 1.7
+++ XMLDocumentParser.java 25 Mar 2003 17:15:15 -0000 1.8
@@ -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
@@ -57,11 +57,11 @@
package org.apache.xerces.parsers;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
+import org.apache.xerces.impl.Constants;
import org.apache.xerces.util.ObjectFactory;
import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.xni.grammars.XMLGrammarPool;
import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.apache.xerces.impl.Constants;
/**
* This is a concrete vanilla XML parser class. It uses the abstract parser
@@ -87,7 +87,7 @@
public XMLDocumentParser() {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.StandardParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
} // <init>()
@@ -104,7 +104,7 @@
public XMLDocumentParser(SymbolTable symbolTable) {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.StandardParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
fConfiguration.setProperty(Constants.XERCES_PROPERTY_PREFIX+Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
} // <init>(SymbolTable)
@@ -117,7 +117,7 @@
XMLGrammarPool grammarPool) {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.StandardParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
fConfiguration.setProperty(Constants.XERCES_PROPERTY_PREFIX+Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
fConfiguration.setProperty(Constants.XERCES_PROPERTY_PREFIX+Constants.XMLGRAMMAR_POOL_PROPERTY,
grammarPool);
1.8 +7 -9
xml-xerces/java/src/org/apache/xerces/parsers/XMLGrammarParser.java
Index: XMLGrammarParser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/XMLGrammarParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLGrammarParser.java 3 Apr 2002 14:55:50 -0000 1.7
+++ XMLGrammarParser.java 25 Mar 2003 17:15:15 -0000 1.8
@@ -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
@@ -57,13 +57,11 @@
package org.apache.xerces.parsers;
-import org.apache.xerces.xni.parser.XMLParserConfiguration;
-import org.apache.xerces.util.SymbolTable;
-import org.apache.xerces.util.ObjectFactory;
-import org.apache.xerces.impl.dv.DTDDVFactory;
import org.apache.xerces.impl.Constants;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
+import org.apache.xerces.impl.dv.DTDDVFactory;
+import org.apache.xerces.util.ObjectFactory;
+import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.xni.parser.XMLParserConfiguration;
/**
* @version $Id$
@@ -90,7 +88,7 @@
protected XMLGrammarParser(SymbolTable symbolTable) {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.StandardParserConfiguration"
+ "org.apache.xerces.parsers.XML11Configuration"
));
fConfiguration.setProperty(Constants.XERCES_PROPERTY_PREFIX+Constants.SYMBOL_TABLE_PROPERTY,
symbolTable);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
