Author: markt
Date: Wed Aug 15 16:03:06 2012
New Revision: 1373489
URL: http://svn.apache.org/viewvc?rev=1373489&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53654
Support file:// URLs for JSP dependencies
Patch provided by Viola Lu
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1373488
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java?rev=1373489&r1=1373488&r2=1373489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Wed Aug
15 16:03:06 2012
@@ -496,7 +496,7 @@ public abstract class Compiler {
try {
String key = include.getKey();
URL includeUrl;
- if (key.startsWith("jar:")) {
+ if (key.startsWith("jar:") || key.startsWith("file:")) {
includeUrl = new URL(key);
} else {
includeUrl = ctxt.getResource(include.getKey());
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=1373489&r1=1373488&r2=1373489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 15 16:03:06 2012
@@ -160,6 +160,10 @@
<bug>53545</bug>: Ensure buffered data is cleared when using a
jsp:forward action inside a classic custom tag. (markt)
</fix>
+ <fix>
+ <bug>53654</bug>: Support <code>file://</code> URLs for JSP
+ dependencies. Patch provided by Viola Lu. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
