You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/10/12 19:16:39 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/xni Makefile XMLEntityHandler.java
andyc 00/10/12 10:16:35
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2 Makefile
XMLDTDScanner.java XMLDocumentScanner.java
XMLEntityManager.java
java/src/org/apache/xerces/parsers Tag: xerces_j_2
XMLDocumentParser.java
java/src/org/apache/xerces/xni Tag: xerces_j_2 Makefile
Added: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLEntityHandler.java
Removed: java/src/org/apache/xerces/xni Tag: xerces_j_2
XMLEntityHandler.java
Log:
1) Moved XMLEntityHandler from XNI to impl. It really only relates
to the XMLEntityManager which is an implementation detail.
2) Updated Makefiles for xni and impl packages.
3) Removed validator from the XMLDocumentParser pipelines. It
isn't ready, yet.
Revision Changes Path
No revision
No revision
1.1.2.6 +1 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/Makefile,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Makefile 2000/10/10 08:06:03 1.1.2.5
+++ Makefile 2000/10/12 17:16:14 1.1.2.6
@@ -5,6 +5,7 @@
Version.class\
XMLDocumentScanner.class\
XMLDTDScanner.class\
+ XMLEntityHandler.class\
XMLEntityManager.class\
XMLEntityScanner.class\
XMLErrorReporter.class\
1.1.2.19 +1 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java
Index: XMLDTDScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDTDScanner.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- XMLDTDScanner.java 2000/10/12 01:05:38 1.1.2.18
+++ XMLDTDScanner.java 2000/10/12 17:16:15 1.1.2.19
@@ -74,7 +74,6 @@
import org.apache.xerces.xni.XMLDTDContentModelSource;
import org.apache.xerces.xni.XMLDTDHandler;
import org.apache.xerces.xni.XMLDTDSource;
-import org.apache.xerces.xni.XMLEntityHandler;
import org.apache.xerces.xni.XMLString;
import org.xml.sax.SAXException;
@@ -84,7 +83,7 @@
/**
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Arnaud Le Hors, IBM
- * @version $Id: XMLDTDScanner.java,v 1.1.2.18 2000/10/12 01:05:38 lehors Exp $
+ * @version $Id: XMLDTDScanner.java,v 1.1.2.19 2000/10/12 17:16:15 andyc Exp $
*/
public class XMLDTDScanner
extends XMLScanner
1.1.2.26 +3 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java
Index: XMLDocumentScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- XMLDocumentScanner.java 2000/10/11 23:07:03 1.1.2.25
+++ XMLDocumentScanner.java 2000/10/12 17:16:16 1.1.2.26
@@ -66,16 +66,17 @@
import org.apache.xerces.impl.XMLEntityScanner;
import org.apache.xerces.impl.XMLErrorReporter;
import org.apache.xerces.impl.msg.XMLMessageFormatter;
+
import org.apache.xerces.util.XMLStringBuffer;
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.util.XMLChar;
+
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
import org.apache.xerces.xni.XMLComponent;
import org.apache.xerces.xni.XMLComponentManager;
import org.apache.xerces.xni.XMLDocumentHandler;
import org.apache.xerces.xni.XMLDocumentSource;
-import org.apache.xerces.xni.XMLEntityHandler;
import org.apache.xerces.xni.XMLString;
import org.xml.sax.SAXException;
@@ -100,7 +101,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 11 11:10:57 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLDocumentScanner.java,v 1.1.2.25 2000/10/11 23:07:03 andyc Exp $
+ * @version $Id: XMLDocumentScanner.java,v 1.1.2.26 2000/10/12 17:16:16 andyc Exp $
*/
public class XMLDocumentScanner
extends XMLScanner
1.1.2.14 +2 -2 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java
Index: XMLEntityManager.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityManager.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- XMLEntityManager.java 2000/10/10 20:27:22 1.1.2.13
+++ XMLEntityManager.java 2000/10/12 17:16:21 1.1.2.14
@@ -75,10 +75,10 @@
import org.apache.xerces.util.SymbolTable;
import org.apache.xerces.util.URI;
import org.apache.xerces.util.XMLChar;
+
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLComponent;
import org.apache.xerces.xni.XMLComponentManager;
-import org.apache.xerces.xni.XMLEntityHandler;
import org.apache.xerces.xni.XMLString;
import org.xml.sax.EntityResolver;
@@ -105,7 +105,7 @@
* @author Stubs generated by DesignDoc on Mon Sep 18 18:23:16 PDT 2000
* @author Andy Clark, IBM
*
- * @version $Id: XMLEntityManager.java,v 1.1.2.13 2000/10/10 20:27:22 lehors Exp $
+ * @version $Id: XMLEntityManager.java,v 1.1.2.14 2000/10/12 17:16:21 andyc Exp $
*/
public class XMLEntityManager
implements XMLComponent {
No revision
No revision
1.1.2.1 +113 -0 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLEntityHandler.java
No revision
No revision
1.1.2.19 +13 -1 xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java
Index: XMLDocumentParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/Attic/XMLDocumentParser.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- XMLDocumentParser.java 2000/10/11 19:00:33 1.1.2.18
+++ XMLDocumentParser.java 2000/10/12 17:16:29 1.1.2.19
@@ -91,7 +91,7 @@
* @author Arnaud Le Hors, IBM
* @author Andy Clark, IBM
*
- * @version $Id: XMLDocumentParser.java,v 1.1.2.18 2000/10/11 19:00:33 andyc Exp $
+ * @version $Id: XMLDocumentParser.java,v 1.1.2.19 2000/10/12 17:16:29 andyc Exp $
*/
public abstract class XMLDocumentParser
extends XMLParser
@@ -835,16 +835,28 @@
fValidator.reset(this);
// setup document pipeline
+ /***
fScanner.setDocumentHandler(fValidator);
fValidator.setDocumentHandler(this);
+ /***/
+ fScanner.setDocumentHandler(this);
+ /***/
// setup dtd pipeline
+ /***
fDTDScanner.setDTDHandler(fValidator);
fValidator.setDTDHandler(this);
+ /***/
+ fDTDScanner.setDTDHandler(this);
+ /***/
// setup dtd content model pipeline
+ /***
fDTDScanner.setDTDContentModelHandler(fValidator);
fValidator.setDTDContentModelHandler(this);
+ /***/
+ fDTDScanner.setDTDContentModelHandler(this);
+ /***/
} // reset()
No revision
No revision
1.1.2.2 +0 -1 xml-xerces/java/src/org/apache/xerces/xni/Attic/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/xni/Attic/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Makefile 2000/10/02 01:01:56 1.1.2.1
+++ Makefile 2000/10/12 17:16:32 1.1.2.2
@@ -11,7 +11,6 @@
XMLDTDSource.class\
XMLDocumentHandler.class\
XMLDocumentSource.class\
- XMLEntityHandler.class\
XMLString.class
DIRS =