Author: mturk
Date: Wed Jan 11 11:04:12 2012
New Revision: 1229956
URL: http://svn.apache.org/viewvc?rev=1229956&view=rev
Log:
BZ52450 Add setter for EntityResolver
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java?rev=1229956&r1=1229955&r2=1229956&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/xmlparser/ParserUtils.java Wed
Jan 11 11:04:12 2012
@@ -133,6 +133,17 @@ public class ParserUtils {
return (parseXMLDocument(uri, new InputSource(is)));
}
+ /**
+ * Set the EntityResolver.
+ * This is needed when the dtds and Jasper itself are in different
+ * classloaders (e.g. OSGi environment).
+ *
+ * @param er EntityResolver to use.
+ */
+ public static void setEntityResolver(EntityResolver er) {
+
+ entityResolver = er;
+ }
// ------------------------------------------------------ Protected Methods
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1229956&r1=1229955&r2=1229956&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jan 11 11:04:12 2012
@@ -151,6 +151,11 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>52450</bug>: Add setter for entityResolver in ParserUtils.
+ This is mainly useful when jasper and dtds are in different
+ class loaders. (mturk)
+ </fix>
+ <fix>
<bug>52321</bug>: Ensure that the order of multiple prelude/coda values
for JSP pages is respected. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
