Author: jboynes
Date: Tue Nov 26 07:04:42 2013
New Revision: 1545558
URL: http://svn.apache.org/r1545558
Log:
Convert JspDocumentParser to an DefaultHandler2
Added TODO on using JarFactory to resolve Tomcat-specific URLs returned by the
Jar abstraction.
Still need to figure how to do that.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1545558&r1=1545557&r2=1545558&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Tue Nov
26 07:04:42 2013
@@ -39,9 +39,8 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.ext.DefaultHandler2;
import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.helpers.DefaultHandler;
/**
* Class implementing a parser for a JSP document, that is, a JSP page in XML
@@ -52,8 +51,8 @@ import org.xml.sax.helpers.DefaultHandle
*/
class JspDocumentParser
- extends DefaultHandler
- implements LexicalHandler, TagConstants {
+ extends DefaultHandler2
+ implements TagConstants {
private static final String LEXICAL_HANDLER_PROPERTY =
"http://xml.org/sax/properties/lexical-handler";;
@@ -237,6 +236,15 @@ class JspDocumentParser
}
}
+ @Override
+ public InputSource resolveEntity(String name, String publicId, String
baseURI, String systemId)
+ throws SAXException, IOException {
+ // TODO URLs returned by the Jar abstraction may be of the form
jar:jar: which
+ // is not a URL that can be resolved by the JRE. This should use the
JarFactory
+ // to construct and return a valid InputSource.
+ return null;
+ }
+
/*
* Receives notification of the start of an element.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
