mrglavas 2005/05/03 21:23:46
Modified: java/src/org/apache/xerces/parsers XMLGrammarParser.java
XMLGrammarCachingConfiguration.java
XMLDocumentParser.java
java/src/org/apache/xerces/dom
CoreDOMImplementationImpl.java
Log:
Upgrade default parser configuration to XIncludeAwareParserConfiguration.
Revision Changes Path
1.11 +3 -3
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLGrammarParser.java 24 Feb 2004 23:15:57 -0000 1.10
+++ XMLGrammarParser.java 4 May 2005 04:23:46 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -46,7 +46,7 @@
protected XMLGrammarParser(SymbolTable symbolTable) {
super((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.19 +2 -2
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLGrammarCachingConfiguration.java 4 May 2005 03:56:45 -0000
1.18
+++ XMLGrammarCachingConfiguration.java 4 May 2005 04:23:46 -0000
1.19
@@ -39,7 +39,7 @@
/**
* <p> This configuration provides a generic way of using
* Xerces's grammar caching facilities. It extends the
- * XML11Configuration and thus may validate documents
+ * XIncludeAwareParserConfiguration and thus may validate documents
* according to XML schemas or DTD's. It also allows the user to
* preparse a grammar, and to lock the grammar pool
* implementation such that no more grammars will be added.</p>
1.11 +5 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLDocumentParser.java 24 Feb 2004 23:15:56 -0000 1.10
+++ XMLDocumentParser.java 4 May 2005 04:23:46 -0000 1.11
@@ -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.
@@ -45,7 +45,7 @@
public XMLDocumentParser() {
super((XMLParserConfiguration)ObjectFactory.createObject(
"org.apache.xerces.xni.parser.XMLParserConfiguration",
- "org.apache.xerces.parsers.XML11Configuration"
+ "org.apache.xerces.parsers.XIncludeAwareParserConfiguration"
));
} // <init>()
@@ -62,7 +62,7 @@
public XMLDocumentParser(SymbolTable symbolTable) {
super((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);
} // <init>(SymbolTable)
@@ -75,7 +75,7 @@
XMLGrammarPool grammarPool) {
super((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);
fConfiguration.setProperty(Constants.XERCES_PROPERTY_PREFIX+Constants.XMLGRAMMAR_POOL_PROPERTY,
grammarPool);
1.34 +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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- CoreDOMImplementationImpl.java 5 Oct 2004 17:12:51 -0000 1.33
+++ CoreDOMImplementationImpl.java 4 May 2005 04:23:46 -0000 1.34
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-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.
@@ -361,7 +361,7 @@
else {
// create default parser configuration validating
against XMLSchemas
return new DOMParserImpl(
- "org.apache.xerces.parsers.XML11Configuration",
+
"org.apache.xerces.parsers.XIncludeAwareParserConfiguration",
schemaType);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
