You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/12/01 00:05:52 UTC
svn commit: r721925 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt
java/org/apache/jasper/compiler/ParserController.java
webapps/docs/changelog.xml
Author: markt
Date: Sun Nov 30 15:05:51 2008
New Revision: 721925
URL: http://svn.apache.org/viewvc?rev=721925&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
Include jar in path for dependencies if they are in a JAR
Patch provided by Cédric Mailleux
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:05:51 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,711126
+/tomcat/trunk:601180,606992,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721925&r1=721924&r2=721925&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:05:51 2008
@@ -158,13 +158,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for service.bat.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
- Include jar in path for dependencies if they are in a JAR
- Patch provided by C�dric Mailleux
- http://svn.apache.org/viewvc?rev=710205&view=rev
- +1: markt, remm, fhanik, pero
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011
Make Principal accessible (if set) via
Subject.getSubject(AccessController.getContext()) when processing filters.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=721925&r1=721924&r2=721925&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ParserController.java Sun Nov 30 15:05:51 2008
@@ -192,7 +192,12 @@
if (parent != null) {
// Included resource, add to dependent list
- compiler.getPageInfo().addDependant(absFileName);
+ if (jarFile == null) {
+ compiler.getPageInfo().addDependant(absFileName);
+ } else {
+ compiler.getPageInfo().addDependant(
+ jarFileUrl.toExternalForm() + absFileName.substring(1));
+ }
}
if ((isXml && isEncodingSpecifiedInProlog) || isBomPresent) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721925&r1=721924&r2=721925&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:05:51 2008
@@ -262,6 +262,11 @@
precedence over JSP.1.3.10. Therefore EL in attributes must be escaped
twice.
</fix>
+ <fix>
+ <bug>46047</bug>: Include the path to the JAR when recording
+ dependencies that are located inside a JAR file. Patch provided by
+ Cédric Mailleux. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org