You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2005/05/02 23:44:37 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/util EntityResolver2Wrapper.java XMLCatalogResolver.java
mrglavas 2005/05/02 14:44:37
Modified: java/src/org/apache/xerces/util EntityResolver2Wrapper.java
XMLCatalogResolver.java
Log:
Moving SAX support up to SAX 2.0.2.
Revision Changes Path
1.5 +2 -17 xml-xerces/java/src/org/apache/xerces/util/EntityResolver2Wrapper.java
Index: EntityResolver2Wrapper.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/EntityResolver2Wrapper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EntityResolver2Wrapper.java 31 Jan 2005 22:31:58 -0000 1.4
+++ EntityResolver2Wrapper.java 2 May 2005 21:44:37 -0000 1.5
@@ -27,7 +27,7 @@
import org.apache.xerces.xni.grammars.XMLDTDDescription;
import org.apache.xerces.xni.parser.XMLInputSource;
-import org.xml.sax.EntityResolver;
+import org.xml.sax.ext.EntityResolver2;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -209,19 +209,4 @@
} // createXMLInputSource(InputSource,String):XMLInputSource
- // TODO: Remove temporary EntityResolver2 interface when
- // the real one becomes available.
-
- /**
- * <p>EntityResolver2 like interface to be removed once
- * the real interface (org.xml.sax.ext.EntityResolver2) is available.</p>
- */
- public interface EntityResolver2 extends EntityResolver {
- public InputSource getExternalSubset(String name, String baseURI)
- throws SAXException, IOException;
- public InputSource resolveEntity(String name, String publicId,
- String baseURI, String systemId)
- throws SAXException, IOException;
- } // interface EntityResolver2
-
} // class EntityResolver2Wrapper
1.8 +3 -8 xml-xerces/java/src/org/apache/xerces/util/XMLCatalogResolver.java
Index: XMLCatalogResolver.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/util/XMLCatalogResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLCatalogResolver.java 13 Jul 2004 03:23:42 -0000 1.7
+++ XMLCatalogResolver.java 2 May 2005 21:44:37 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004,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.
@@ -18,14 +18,9 @@
import java.io.IOException;
-/**
- * Switch the following import statement once the real interface
- * (org.xml.sax.ext.EntityResolver2) is available.
- */
-// import org.xml.sax.ext.EntityResolver2;
-import org.apache.xerces.util.EntityResolver2Wrapper.EntityResolver2;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.ext.EntityResolver2;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org