Author: markt
Date: Thu Oct 10 13:29:13 2013
New Revision: 1530971
URL: http://svn.apache.org/r1530971
Log:
Fix TLD processing when using JspC.
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1530971&r1=1530970&r2=1530971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Oct 10 13:29:13 2013
@@ -1424,6 +1424,8 @@ public class JspC extends Task implement
context = new JspCServletContext(log, resourceBase, classLoader);
TldScanner scanner = new TldScanner(context, true, validateXml);
+ scanner.setClassLoader(classLoader);
+
try {
scanner.scan();
} catch (SAXException e) {
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1530971&r1=1530970&r2=1530971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Thu Oct 10
13:29:13 2013
@@ -115,6 +115,14 @@ public class TldScanner {
}
/**
+ * Set the class loader used by the digester to create objects as a result
+ * of this scan. Normally this only needs tobe set when using JspC.
+ */
+ public void setClassLoader(ClassLoader classLoader) {
+ tldParser.setClassLoader(classLoader);
+ }
+
+ /**
* Scan for TLDs required by the platform specification.
*/
protected void scanPlatform() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java?rev=1530971&r1=1530970&r2=1530971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java Thu
Oct 10 13:29:13 2013
@@ -62,4 +62,8 @@ public class TldParser {
digester.reset();
}
}
+
+ public void setClassLoader(ClassLoader classLoader) {
+ digester.setClassLoader(classLoader);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
