Re: Tomcat-Lite update
On 06/01/2010 00:27, Costin Manolache wrote: > Also, I would like to know if other comitters are OK with (temporarily - > i.e. until the 7.0 release vote) including lite in the tomcat7 builds, > so people can try it out. How about adding it to the extras build? It could be included in the release then as well. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48489] Tomcat CL doesn't resolve the array classes.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48489 --- Comment #12 from VickyKak 2010-01-06 01:15:30 UTC --- Bug48489.patch is the required fix. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48489] Tomcat CL doesn't resolve the array classes.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48489
VickyKak changed:
What|Removed |Added
Resolution|INVALID |FIXED
--- Comment #13 from VickyKak 2010-01-06 01:18:25 UTC ---
(In reply to comment #12)
> Bug48489.patch is the required fix.
Sorry...
If loader.loadClass("[Ljava.lang.String;") works fine then I would expect
loader.loadClass("[Lsample.SampleClass;") too a proper usage.
I don't think loader.loadClass("[Lsample.SampleClass;") is wrong usage, the
TocmatCL should resolve the custom class array also which could internally be
done by delegating to system CL.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Log rotation in Tomcat Connector
Hi Tim,
On 06.01.2010 03:28, Tim Whittington wrote:
For consistency (with Apache at least) I've gone down the road of mirroring the
functionality of rotatelogs, which was fairly easy.
I'm doing some long running tests (I'm seeing some weird DLL unloading/crashing
behaviour in IIS 5.1 that I want to replicate and account for), but if that
works out I'll port the changes to trunk (I'm developing on JK_1_2_28 at the
moment for some reason) and submit a patch.
Looking forward to that!
The downside of the rotatelogs approach is that it's not easy to do log pruning
(since the filenames are based on the time the log rotates, rather than some
kind of backup suffix scheme), so I may do nothing about that for now - the
best I could do is keep a list in memory and prune, which is sub-optimal.
I'm fine with letting the pruning be done by something external.
Regards,
Rainer
- Original Message -
From: "Rainer Jung"
To: "Tomcat Developers List"
Sent: Saturday, 19 December, 2009 1:01:53 AM GMT +12:00 New Zealand
Subject: Re: [PROPOSAL] Log rotation in Tomcat Connector
Hi Tim,
On 18.12.2009 03:26, Tim Whittington wrote:
Hi all
We're experiencing issues with the Tomcat Connector log in some IIS production
sites where the log file grows to a very large size (8GB on one site).
This is almost entirely due to connection errors between the front end and back
end produced when the back-end Tomcat is restarted after crashes or for
maintenance.
(we have some very high request volume sites - some with hundreds of concurrent
requests -, so you can get thousands of these errors on each restart).
I'm thinking about implementing log file rotation in the IIS connector as a
solution to this, and wanted to canvas opinions on alternatives and
implementation first.
Good thing, that was open for a long time for the isapi redirector.
What I intend implementing is:
* Daily log file rolling (not configurable) as a clone of the log_to_file
function (check rotation, close and reopen log file, continue)
* Very simple configuration for a daily rolling file appender - basically
'on/off' and 'number of days to keep', possibly a single rotateable=bool/int
parameter.
* The log file name suffix will be appended/inserted to the name of the file
specified in the connector config with a static pattern e.g. _MM_dd
* The log method(s) will be guarded with a mutex to protect the rollover
operation
* I'll only be doing this for the ISAPI redirector at present (so won't need to
refactor jk_mt.h to make the locking primitives available on prefork builds)
* On rollover, the file will be closed and a new one opened. Older files will
be pruned.
* Rollover checking can be a simple mod operation on the timestamp (since I'm
not intending to handle log formats)
Questions I have:
* Short of silencing the logging, is there an alternative to rolling the file?
(perhaps rolling up of repeated connection errors?)
* Are there any performance concerns about using a mutex on each log? (log4c
uses this approach, so I presume it's not prohibitive)
* Does anyone have any other input into config/behaviour?
Mutex
=
- log rotation for mod_jk with Apache is done using an external process
and logging through a pipe. The external process often used with Apache
is rotatelogs, that comes with apache and thus is also available under
ASL 2.0
- log path for Apache should not change seriously, e.g. no additional
mutex when running mod_jk inside Apache.
- for the redirector I'd say adding a mutex is OK, if it is acquired
after the log line has been formatted and immediately before the line
gets written to the file. So you'll only lock the access to the file.
In apache-2.0/mod_jk.c you will find for example jk_log_to_file(), which
does
rv = apr_global_mutex_lock(jk_log_lock);
if (rv != APR_SUCCESS) {
... log error via Apache ...
}
rv = apr_file_write(p->jklogfp, what,&wrote);
if (rv != APR_SUCCESS) {
... log error via Apache ...
}
rv = apr_global_mutex_unlock(jk_log_lock);
if (rv != APR_SUCCESS) {
... log error via Apache ...
}
Rolling
===
You could also think about doing the rolling externally like we do with
Apache and pipes in case the user configured a pipe as the log file. I'm
not sure about ISAPI and the IIS process management, whether this is
feasable, e.g. all IIS processes sharing the file descriptor to the pipe
etc.
Apart from that I think having a simple daily solution, which can be
activated or deactivated would already be a very useful start. We can
always add more features, once the basics are there. Obvious possible
extensions are more fine grained rolling intervals, alternatively basing
the rolling on file size, flexible file name pattern, etc.
Pruning
===
I'm not a big fan of pruning the old files directly from the server
process. I'd say pruning is part of some external log file management,
which usually does compression, transferral to a log server and removing
old files once they are old enough
DO NOT REPLY [Bug 48489] Tomcat CL doesn't resolve the array classes.
https://issues.apache.org/bugzilla/show_bug.cgi?id=48489 Mark Thomas changed: What|Removed |Added Resolution|FIXED |INVALID -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
JK 1.2.29 Plan
Any objections to the following plan about JK 1.2.29? - 15.01.2009 make snapshot available for testing feedback like we did for nearly all previous releases - ~22.01.2009 tag 1.2.29 (exact date depending whether there's bug feedback) Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JK 1.2.29 Plan
+1 2010/1/6 Rainer Jung : > Any objections to the following plan about JK 1.2.29? > > - 15.01.2009 > make snapshot available for testing feedback like we did > for nearly all previous releases > > - ~22.01.2009 > tag 1.2.29 (exact date depending whether there's bug feedback) > > Regards, > > Rainer > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896370 - in /tomcat/trunk: conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml
Author: markt Date: Wed Jan 6 10:24:31 2010 New Revision: 896370 URL: http://svn.apache.org/viewvc?rev=896370&view=rev Log: Fix typos / inconsistencies Rainer's review comments on r894580 Modified: tomcat/trunk/conf/web.xml tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/trunk/webapps/docs/cgi-howto.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=896370&r1=896369&r2=896370&view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Wed Jan 6 10:24:31 2010 @@ -293,7 +293,7 @@ - + @@ -304,7 +304,7 @@ - +
DO NOT REPLY [Bug 48454] "Bad file descriptor"-IOException in CGIServlet for some programs
https://issues.apache.org/bugzilla/show_bug.cgi?id=48454 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-01-06 02:29:50 GMT --- This has been fixed in 6.0.x and will be included in 6.0.23 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896371 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt conf/web.xml java/org/apache/catalina/servlets/CGIServlet.java webapps/docs/cgi-howto.xml webapps/docs/changelog.xml
Author: markt Date: Wed Jan 6 10:30:07 2010 New Revision: 896371 URL: http://svn.apache.org/viewvc?rev=896371&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48454 Give the stderr reader a chance to finish before terminating the CGI process. This avoids "Bad file descriptor" errors. The period to wait is configurable. Based on a patch by Markus Grieder with review comments from Rainer Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc6.0.x/trunk/webapps/docs/cgi-howto.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 10:30:07 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,8880
DO NOT REPLY [Bug 48417] series of patches to LocalStrings_fr.properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=48417 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2010-01-06 02:45:15 GMT --- The patches have been applied to 6.0.x and will be included in 6.0.23 onwards. Again, many thanks. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896378 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/realm/ java/org/apache/
Author: markt Date: Wed Jan 6 10:46:49 2010 New Revision: 896378 URL: http://svn.apache.org/viewvc?rev=896378&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48417 Correct French translations Patches provided by André Warnier Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 10:46:49 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894831,896370 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,82
svn commit: r896383 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/group/interceptors/ java/org/apache/jasper/compiler/ webapps/docs/
Author: markt
Date: Wed Jan 6 10:51:53 2010
New Revision: 896383
URL: http://svn.apache.org/viewvc?rev=896383&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48398
Objects used as locks should be final
Patches provided by sebb
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896383&r1=896382&r2=896383&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 6 10:51:53 2010
@@ -103,14 +103,6 @@
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48398
- Objects used as locks should be final
- https://issues.apache.org/bugzilla/attachment.cgi?id=24714
- https://issues.apache.org/bugzilla/attachment.cgi?id=24717
- Patches provided by sebb
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
Sessions timed out too early when using PersistentManager
Port of patch by Keiichi Fujino
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=896383&r1=896382&r2=896383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
Wed Jan 6 10:51:53 2010
@@ -91,7 +91,7 @@
private transient long lastTimeReplicated = System.currentTimeMillis();
-protected Lock diffLock = new ReentrantReadWriteLock().writeLock();
+protected final Lock diffLock = new ReentrantReadWriteLock().writeLock();
private long version;
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=896383&r1=896382&r2=896383&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Wed Jan 6 10:51:53 2010
@@ -61,8 +61,8 @@
private boolean forwardExpired = true;
private int maxQueue = Integer.MAX_VALUE;
-ReentrantReadWriteLock inLock = new ReentrantReadWriteLock(true);
-ReentrantReadWriteLock outLock= new ReentrantReadWriteLock(true);
+final ReentrantReadWriteLock inLock = new ReentrantReadWriteLock(true);
+final ReentrantReadWriteLock outLock= new ReentrantReadWriteLock(true);
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
if ( !okToProcess(msg.getOptions()) ) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=896383&r1=896382&r2=896383&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/AntCompiler.java Wed
Jan 6 10:51:53 2010
@@ -44,7 +44,7 @@
*/
public class AntCompiler extends Compiler {
-protected static Object javacLock = new Object();
+protected static final Object javacLock = new Object();
static {
System.setErr(new SystemLogHandler(System.err));
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=896383&r1=896382&r2=896383&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 6 10:51:53 2010
@@ -37,6 +37,10 @@
+48398: Make objects used as locks final to ensure correct
+operation. Patch provided by sebb. (markt)
+
+
48417: Update French translations. Patch provided by André
Warnier. (markt/kkolinko)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional
DO NOT REPLY [Bug 48398] Lock fields should be final
https://issues.apache.org/bugzilla/show_bug.cgi?id=48398 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Mark Thomas 2010-01-06 02:51:53 GMT --- This has been fixed in 6.0.x and will be included in 6.0.23 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896384 - /tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Author: markt
Date: Wed Jan 6 10:56:48 2010
New Revision: 896384
URL: http://svn.apache.org/viewvc?rev=896384&view=rev
Log:
Move declaration as per Knostantin's review comment
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=896384&r1=896383&r2=896384&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Jan
6 10:56:48 2010
@@ -57,15 +57,15 @@
public class CoyoteAdapter implements Adapter {
+private static final Log log = LogFactory.getLog(CoyoteAdapter.class);
+
+// -- Constants
+
private static final String POWERED_BY = "Servlet/3.0 JSP/2.2 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
-private static final Log log = LogFactory.getLog(CoyoteAdapter.class);
-
-// -- Constants
-
private static final EnumSet SSL_ONLY =
EnumSet.of(SessionTrackingMode.SSL);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896389 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/connector/CoyoteAdapter.java webapps/docs/changelog.xml
Author: markt Date: Wed Jan 6 11:09:55 2010 New Revision: 896389 URL: http://svn.apache.org/viewvc?rev=896389&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48006 Update X-Powered-By header to include information suggested by the Servlet spec Use java.runtime.version as we already use it elsewhere Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 11:09:55 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894831,895013,896370 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,8
svn commit: r896391 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: ha/LocalStrings_fr.properties mbeans/LocalStrings_fr.properties tribes/LocalStrings_fr.properties
Author: markt Date: Wed Jan 6 11:12:05 2010 New Revision: 896391 URL: http://svn.apache.org/viewvc?rev=896391&view=rev Log: Add additional files missed in r896378 Added: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings_fr.properties - copied unchanged from r894586, tomcat/trunk/java/org/apache/catalina/ha/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties - copied unchanged from r894586, tomcat/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings_fr.properties - copied unchanged from r894586, tomcat/trunk/java/org/apache/catalina/tribes/LocalStrings_fr.properties - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896393 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/javax/servlet/jsp/JspContext.java webapps/docs/changelog.xml
Author: markt Date: Wed Jan 6 11:18:22 2010 New Revision: 896393 URL: http://svn.apache.org/viewvc?rev=896393&view=rev Log: Add missing deprecation markers Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/JspContext.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 6 11:18:22 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,896370,896384 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,896370,896384 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewv
svn commit: r896395 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Jan 6 11:19:33 2010 New Revision: 896395 URL: http://svn.apache.org/viewvc?rev=896395&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896395&r1=896394&r2=896395&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 6 11:19:33 2010 @@ -114,7 +114,7 @@ current year applied by ant version filter. http://svn.apache.org/viewvc?rev=895203&view=rev http://svn.apache.org/viewvc?rev=895206&view=rev - +1: rjung, kkolinko + +1: rjung, kkolinko, markt -1: * Allow special characters recognized by the Windows command-line shell to - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JK 1.2.29 Plan
+1 Regards Peter Am 06.01.2010 um 11:07 schrieb Rainer Jung: Any objections to the following plan about JK 1.2.29? - 15.01.2009 make snapshot available for testing feedback like we did for nearly all previous releases - ~22.01.2009 tag 1.2.29 (exact date depending whether there's bug feedback) Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JK 1.2.29 Plan
+1 I've done majority of planned fixes. Let's tag and then play with IIS rotatelogs. BTW, the IIS logging should be fixed now (compiling with commode.obj that forces a real flush on fflush) On 01/06/2010 11:07 AM, Rainer Jung wrote: Any objections to the following plan about JK 1.2.29? - 15.01.2009 make snapshot available for testing feedback like we did for nearly all previous releases - ~22.01.2009 tag 1.2.29 (exact date depending whether there's bug feedback) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PROPOSAL] Log rotation in Tomcat Connector
On 01/06/2010 03:28 AM, Tim Whittington wrote:
The downside of the rotatelogs approach is that it's not easy to do log pruning
(since the filenames are based on the time the log rotates, rather than some
kind of backup suffix scheme), so I may do nothing about that for now - the
best I could do is keep a list in memory and prune, which is sub-optimal.
I have a modified Apache's logrotate that runs as a service
and listens on a pipe. Opening log files is then
fopen("PIPE\\.\\isapi_redirect_log")
The drawback is that additional service has to be installed
but it eliminates all the problems with process redirection
especially with multiple worker processes.
Also there is no need to change any of the current logging code
inside isapi_redirect.
Regards
--
^TM
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat-Lite update
+1 - I like the ideas +0 - [Day job time constraints to help - but I'll look as I can] -Tim On 1/5/2010 7:27 PM, Costin Manolache wrote: Also, I would like to know if other comitters are OK with (temporarily - i.e. until the 7.0 release vote) including lite in the tomcat7 builds, so people can try it out. I would like to have it in common/, so it is visible in servlets - as I mentioned one of the goals is for tomcat-lite to be more of a library that is used for client http, include filters/servlets that can be used in any container, etc. When 7.0 is ready we can remove it or include it if you feel it's ready. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48492] New: RequestDispatcher.include(...) jumps the queue of out.print()
https://issues.apache.org/bugzilla/show_bug.cgi?id=48492
Summary: RequestDispatcher.include(...) jumps the queue of
out.print()
Product: Tomcat 6
Version: 6.0.16
Platform: PC
OS/Version: Mac OS X 10.4
Status: NEW
Severity: major
Priority: P2
Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: mozi...@horz.de
The response of the including Servlet/JSP is always put after all responses
of all included Servlets/JSP:
B.jsp
-
Line B
-
ABC.jsp
-
Line A
<% RequestDispatcher dispatcher = request.getRequestDispatcher("/B.jsp");
dispatcher.include( request, response ); %>
Line C
-
Expected Response of ABC.jsp:
-
Line A
Line B
Line C
-
Actual Response of ABC.jsp:
-
Line B
Line A
Line C
-
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by JohnDeRegnaucour t
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by JohnDeRegnaucourt.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=218&rev2=219
--
[[http://www.etrade.com/|E*Trade]] - a financial services company, with a
story from
[[http://www.eweek.com/article2/0,1895,1916587,00.asp|eweek.com]]
+ = MyOtherDrive =
+ {{http://www.myotherdrive.com/images/myotherdrive-logo-v4.jpg}}
+ MyOtherDrive.com, an Online Backup and File Sharing provider, runs on Apache
Tomcat. MOD uses multiple Apache Tomcat servers and MySQL.
= LeadsandDeals =
{{http://www.leadsanddeals.com/mypictures/leadsanddealslogo.gif}}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by JohnDeRegnaucour t
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by JohnDeRegnaucourt.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=219&rev2=220
--
= MyOtherDrive =
{{http://www.myotherdrive.com/images/myotherdrive-logo-v4.jpg}}
- MyOtherDrive.com, an Online Backup and File Sharing provider, runs on Apache
Tomcat. MOD uses multiple Apache Tomcat servers and MySQL.
+ [[http://www.MyOtherDrive.com|MyOtherDrive]] an Online Backup and File
Sharing provider, runs on Apache Tomcat.
= LeadsandDeals =
{{http://www.leadsanddeals.com/mypictures/leadsanddealslogo.gif}}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by JohnDeRegnaucour t
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by JohnDeRegnaucourt.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=220&rev2=221
--
[[http://www.etrade.com/|E*Trade]] - a financial services company, with a
story from
[[http://www.eweek.com/article2/0,1895,1916587,00.asp|eweek.com]]
+ = LeadsandDeals =
+ {{http://www.leadsanddeals.com/mypictures/leadsanddealslogo.gif}}
+ [[http://www.leadsanddeals.com.com|LeadsandDeals.com]]
+
= MyOtherDrive =
{{http://www.myotherdrive.com/images/myotherdrive-logo-v4.jpg}}
[[http://www.MyOtherDrive.com|MyOtherDrive]] an Online Backup and File
Sharing provider, runs on Apache Tomcat.
-
- = LeadsandDeals =
- {{http://www.leadsanddeals.com/mypictures/leadsanddealslogo.gif}}
- [[http://www.leadsanddeals.com.com|LeadsandDeals.com]]
= NetHosted =
{{http://www.nethosted.co.uk/img/nhlogo.png}}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48492] RequestDispatcher.include(...) jumps the queue of out.print()
https://issues.apache.org/bugzilla/show_bug.cgi?id=48492 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2010-01-06 06:34:52 GMT --- This is as expected. Search the JSP spec for "flush". If you need further assistance please ask on the users list. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47512] Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 --- Comment #9 from Martín Schonaker 2010-01-06 06:51:50 UTC --- (In reply to comment #8) > Whilst binding objects into the global JNDI directory where the classes are > only available to the web application class loader may be possible, this is > asking from all sorts of class loading pain and memory leaks. > > On that basis I am marking this as WONTFIX. > > If you want this functionality in your environment the simplest way to achieve > it is to patch org.apache.naming.NamingContext, compile the class and then > place the class file in > CATALINA_HOME/lib/org/apache/naming/NamingContext.class > I'd also put the .java file alongside it so people can easily see what you > changed. I've found another workaround. Thanks for your time, guys. Please review these ideas when you have the time. As I said, NamingContext implementation is flawed and *that's* a cause for class loading pain. Please allow me to recommend you to check Sun's JNDI/RMI Service Provider (Object Factory implementation code available here http://www.docjar.com/html/api/com/sun/jndi/rmi/registry/RegistryContextFactory.java.html) or JBoss JNP client naming implementation as a reference. Best Regards. Martin. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48492] RequestDispatcher.include(...) jumps the queue of out.print()
https://issues.apache.org/bugzilla/show_bug.cgi?id=48492 Alexander Horz changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #2 from Alexander Horz 2010-01-06 07:10:48 UTC --- > This is as expected. Search the JSP spec for "flush". Could you please point out why the actual behaviour should be expected according to the spec? IMHO, the actual result is NOT expected (cf. JavaTM Servlet Specification, Version 2.5 MR6, p. 61): SRV.8.3The Include Method The include method of the RequestDispatcher interface may be called at any time. The target servlet of the include method has access to all aspects of the request object, but its use of the response object is more limited. It can only write information to the ServletOutputStream or Writer of the response object and commit a response by writing content past the end of the response buffer, or by explicitly calling the flushBuffer method of the ServletResponse interface. It cannot set headers [...] In addition, you may find (on p. 62 of the spec.): SRV.8.4The Forward Method The forward method of the RequestDispatcher interface may be called by the calling servlet only when no output has been committed to the client. [...] These two occurences are the only two near to RequestDispatcher.include(). Could you please provide a page or section number where to look for? Anyway, in both cases (includ() or forward()) the target servlet is expected to write to the OutputStream or Writer of the calling servlet. Hence, if the target servlet calls the flushBuffer method, the output of the calling servlet is expected to be appear *before* the output of the target servlet. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48492] RequestDispatcher.include(...) jumps the queue of out.print()
https://issues.apache.org/bugzilla/show_bug.cgi?id=48492 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Comment #3 from Mark Thomas 2010-01-06 07:14:12 GMT --- Bugzilla is not the correct forum to ask questions about spec interpretation. Please follow my previous advice and read the JSP spec (not the Servlet spec) and if things are still not clear use the users list for further assistance. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896530 - /tomcat/trunk/dist.xml
Author: rjung
Date: Wed Jan 6 16:55:45 2010
New Revision: 896530
URL: http://svn.apache.org/viewvc?rev=896530&view=rev
Log:
Tab police.
Modified:
tomcat/trunk/dist.xml
Modified: tomcat/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=896530&r1=896529&r2=896530&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Wed Jan 6 16:55:45 2010
@@ -296,35 +296,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
Apache Tomcat ${version} native binaries for Win64 IA64 platform.
-
-
+
+
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-
+
-
@@ -341,7 +341,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896544 - in /tomcat/trunk: build.xml dist.xml extras.xml
Author: rjung
Date: Wed Jan 6 17:07:14 2010
New Revision: 896544
URL: http://svn.apache.org/viewvc?rev=896544&view=rev
Log:
Cleanup tabs and trailing whitespace.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/dist.xml
tomcat/trunk/extras.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=896544&r1=896543&r2=896544&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jan 6 17:07:14 2010
@@ -132,7 +132,7 @@
-
+
@@ -159,8 +159,8 @@
optimize="${compile.optimize}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
- includeAntRuntime="true" >
-
@@ -201,7 +201,7 @@
-
+
@@ -276,14 +276,14 @@
-
+
-
+
@@ -297,7 +297,7 @@
-
+
@@ -305,7 +305,7 @@
-
+
@@ -324,12 +324,12 @@
-
+
-
+
@@ -343,7 +343,7 @@
-
+
@@ -436,9 +436,9 @@
+fullpath="META-INF/NOTICE" />
+fullpath="META-INF/LICENSE" />
@@ -545,7 +545,7 @@
-
+
@@ -570,7 +570,7 @@
-
+
@@ -587,7 +587,7 @@
-
+
@@ -711,7 +711,7 @@
-
@@ -721,10 +721,10 @@
depends="build-prepare,build-manifests,compile" >
-
-
+
+
-
@@ -748,9 +748,9 @@
-
+
-
-
-
+
+
+
-
+
@@ -794,8 +794,8 @@
-
-
+
+
+ description="Delete the default output folders">
@@ -915,7 +915,7 @@
-
+
@@ -974,7 +974,7 @@
+ manifest="${tomcat.tmp}/default.manifest">
@@ -989,7 +989,7 @@
+ manifest="${tomcat.tmp}/default.manifest">
Modified: tomcat/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=896544&r1=896543&r2=896544&view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Wed Jan 6 17:07:14 2010
@@ -124,7 +124,7 @@
-
@@ -435,7 +435,7 @@
-
+
@@ -459,7 +459,7 @@
-
+
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=896544&r1=896543&r2=896544&view=diff
==
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Wed Jan 6 17:07:14 2010
@@ -91,23 +91,23 @@
-
+
-
+ description="Build JULI for log4j extras package">
+
-
-
-
+
+
+
+ encoding="ISO-8859-1">
-
+value="org.apache.juli" />
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -167,11 +167,11 @@
+ manifest="${tomcat.tmp}/default.manifest" >
-
-
-
+
+
+
@@ -187,66 +187,66 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ description="Build web services extras package">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
svn commit: r896556 - /tomcat/trunk/extras.xml
Author: rjung
Date: Wed Jan 6 17:33:22 2010
New Revision: 896556
URL: http://svn.apache.org/viewvc?rev=896556&view=rev
Log:
Fix indentation.
Modified:
tomcat/trunk/extras.xml
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=896556&r1=896555&r2=896556&view=diff
==
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Wed Jan 6 17:33:22 2010
@@ -167,7 +167,7 @@
+ manifest="${tomcat.tmp}/default.manifest" >
@@ -254,7 +254,7 @@
fullpath="META-INF/NOTICE" />
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896557 - /tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Wed Jan 6 17:33:26 2010
New Revision: 896557
URL: http://svn.apache.org/viewvc?rev=896557&view=rev
Log:
Start to expand the EL test cases
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=896557&r1=896556&r2=896557&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Wed Jan 6 17:33:26
2010
@@ -46,9 +46,32 @@
assertEquals("false", evaluateExpression("${false?true:false}"));
}
-public void testMisc() {
-// From bug 45451 - not a parser bug
-assertEquals("\\", evaluateExpression(""));
+public void testParserLiteralExpression() {
+// Inspired by work on bug 45451, comments from kkolinko on the dev
+// list and looking at the spec to find some edge cases
+
+// '\' is only an escape character inside a StringLiteral
+assertEquals("", evaluateExpression(""));
+}
+
+public void testParserStringLiteral() {
+// Inspired by work on bug 45451, comments from kkolinko on the dev
+// list and looking at the spec to find some edge cases
+
+// '\' is only an escape character inside a StringLiteral
+assertEquals("\\", evaluateExpression("${''}"));
+assertEquals("\\", evaluateExpression("${\"\"}"));
+
+// Can use ''' inside '"' when quoting with '"' and vice versa without
+// escaping
+assertEquals("\\\"", evaluateExpression("${'\"'}"));
+assertEquals("\"\\", evaluateExpression("${'\"'}"));
+assertEquals("\\'", evaluateExpression("${'\\''}"));
+assertEquals("'\\", evaluateExpression("${'\\''}"));
+assertEquals("\\'", evaluateExpression("${\"'\"}"));
+assertEquals("'\\", evaluateExpression("${\"'\"}"));
+assertEquals("\\\"", evaluateExpression("${\"\\\"\"}"));
+assertEquals("\"\\", evaluateExpression("${\"\\\"\"}"));
}
private void compareBoth(String msg, int expected, Object o1, Object o2){
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896565 - in /tomcat/tc6.0.x/trunk: build.xml dist.xml extras.xml
Author: rjung
Date: Wed Jan 6 17:38:33 2010
New Revision: 896565
URL: http://svn.apache.org/viewvc?rev=896565&view=rev
Log:
No functional change.
Sync 6.0 ant files a bit better with trunk to make
backports easier and more robust:
- detab
- remove trailing whitespace
- line breaks
- attribute order
- "toDir" -> "todir" once
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896565&r1=896564&r2=896565&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 17:38:33 2010
@@ -51,13 +51,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -115,7 +115,7 @@
-
+
@@ -142,7 +142,9 @@
optimize="${compile.optimize}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1">
-
+
@@ -182,7 +184,7 @@
-
+
@@ -217,7 +219,7 @@
-
+
@@ -249,7 +251,7 @@
-
+
@@ -276,14 +278,14 @@
-
+
-
@@ -486,13 +488,13 @@
-
+
WARNING: tomcat-dbcp.jar not included, this build can't be used
in a release. Please run 'ant download' with JDK1.5 if you are
building a tomcat release.
-
+
-
+
@@ -634,14 +636,14 @@
-
+ description="Clean depend src components">
@@ -698,7 +700,7 @@
+ depends="build-manifests">
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=896565&r1=896564&r2=896565&view=diff
==
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 6 17:38:33 2010
@@ -89,7 +89,7 @@
-
+
@@ -131,7 +131,7 @@
-
@@ -156,8 +156,8 @@
-
-
+
+
@@ -189,7 +189,7 @@
-
+
@@ -199,8 +199,8 @@
-
-
+
+
@@ -213,7 +213,7 @@
author="true" version="true"
windowtitle="Tomcat API Documentation"
doctitle="Tomcat API"
- bottom="Copyright © 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ bottom="Copyright © 2000-${year} Apache Software Foundation.
All Rights Reserved."
additionalparam="-breakiterator"
maxmemory="256m" >
@@ -282,7 +282,6 @@
-
@@ -293,24 +292,24 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -334,7 +333,7 @@
-
+
@@ -355,7 +354,7 @@
todir="${tomcat.release}/v${version}"/>
-
+
@@ -426,9 +425,8 @@
-
-
+
@@ -451,7 +449,7 @@
-
+
@@ -459,7 +457,6 @@
-
@@ -514,8 +511,8 @@
-
-
+
+
@@ -552,6 +549,7 @@
+
@@ -560,7 +558,6 @@
-
@@ -578,8 +575,8 @@
-
+ includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1"
fixlast="false" />
+
@@ -603,7 +600,7 @@
-
+
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=896565&r1=896564&r2=896565&view=diff
==
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 6 17:38:33 2010
@@ -102,21 +102,21 @@
-
+
-
+
-
-
-
+
+
+
+ encoding="ISO-8859-1">
-
+value="org.apache.juli" />
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -176,11 +176,11 @@
+ manifest="${tomcat.tmp}/default.manifest" >
-
-
-
svn commit: r896570 - /tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Author: markt
Date: Wed Jan 6 17:39:58 2010
New Revision: 896570
URL: http://svn.apache.org/viewvc?rev=896570&view=rev
Log:
Fix the test case failures. There is at least one bug still present - more test
cases to follow.
Modified:
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=896570&r1=896569&r2=896570&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Wed Jan 6
17:39:58 2010
@@ -54,8 +54,7 @@
char c = image.charAt(i);
if (c == '\\' && i + 1 < size) {
char c1 = image.charAt(i + 1);
-if (c1 == '\\' || c1 == '"' || c1 == '\'' || c1 == '#'
-|| c1 == '$') {
+if (c1 == '#' || c1 == '$') {
c = c1;
i++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896571 - /tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Wed Jan 6 17:41:11 2010
New Revision: 896571
URL: http://svn.apache.org/viewvc?rev=896571&view=rev
Log:
Additional tests for the specific escaping (of "${" and "#{") for
LiteralExpressions
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=896571&r1=896570&r2=896571&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Wed Jan 6 17:41:11
2010
@@ -52,6 +52,22 @@
// '\' is only an escape character inside a StringLiteral
assertEquals("", evaluateExpression(""));
+
+/*
+ * LiteralExpresions can only contain ${ or #{ if escaped with \
+ * \ is not an escape character in any other circumstances including \\
+ */
+assertEquals("\\", evaluateExpression("\\"));
+assertEquals("$", evaluateExpression("$"));
+assertEquals("#", evaluateExpression("#"));
+assertEquals("\\$", evaluateExpression("\\$"));
+assertEquals("\\#", evaluateExpression("\\#"));
+assertEquals("$", evaluateExpression("$"));
+assertEquals("#", evaluateExpression("#"));
+assertEquals("${", evaluateExpression("\\${"));
+assertEquals("#{", evaluateExpression("\\#{"));
+assertEquals("\\${", evaluateExpression("${"));
+assertEquals("\\#{", evaluateExpression("#{"));
}
public void testParserStringLiteral() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896574 - /tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Author: markt Date: Wed Jan 6 17:44:15 2010 New Revision: 896574 URL: http://svn.apache.org/viewvc?rev=896574&view=rev Log: Don't edit the generated files at all - makes regeneration simpler Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=896574&r1=896573&r2=896574&view=diff == --- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original) +++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Wed Jan 6 17:44:15 2010 @@ -1,5 +1,7 @@ /* Generated By:JJTree&JavaCC: Do not edit this line. ELParserTokenManager.java */ package org.apache.el.parser; +import java.io.StringReader; +import javax.el.ELException; /** Token Manager. */ public class ELParserTokenManager implements ELParserConstants - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896588 - in /tomcat/tc6.0.x/trunk: build.xml dist.xml
Author: rjung Date: Wed Jan 6 18:09:56 2010 New Revision: 896588 URL: http://svn.apache.org/viewvc?rev=896588&view=rev Log: - add versions filter to ant files, needed for: - backport r895203 Modified: tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/dist.xml Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896588&r1=896587&r2=896588&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 18:09:56 2010 @@ -104,6 +104,7 @@ + @@ -148,15 +149,9 @@ - - - - - - - - + + @@ -422,15 +417,16 @@ - + + - - + + + @@ -507,13 +503,23 @@ + + + + + + + + + - + + @@ -525,15 +531,22 @@ + + + + + + + - - + + + http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=896588&r1=896587&r2=896588&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 6 18:09:56 2010 @@ -86,6 +86,15 @@ + + + + + + + + + @@ -165,8 +174,8 @@ - - + + @@ -313,16 +322,13 @@ - - - - - - + + + @@ -349,21 +355,23 @@ - + encoding="ISO-8859-1"> + + +encoding="ISO-8859-1"> + + +encoding="ISO-8859-1"> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896589 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParser.jjt ELParserConstants.java ELParserTokenManager.java ParseException.java Token.java TokenMgrError.java
Author: markt
Date: Wed Jan 6 18:10:41 2010
New Revision: 896589
URL: http://svn.apache.org/viewvc?rev=896589&view=rev
Log: (empty)
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/el/parser/ELParserConstants.java
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/ParseException.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=896589&r1=896588&r2=896589&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Wed Jan 6 18:10:41
2010
@@ -1486,9 +1486,9 @@
private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(29)) {
+if (jj_scan_token(28)) {
jj_scanpos = xsp;
-if (jj_scan_token(30)) return true;
+if (jj_scan_token(29)) return true;
}
return false;
}
@@ -1501,9 +1501,9 @@
private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(31)) {
+if (jj_scan_token(30)) {
jj_scanpos = xsp;
-if (jj_scan_token(32)) return true;
+if (jj_scan_token(31)) return true;
}
return false;
}
@@ -1511,9 +1511,9 @@
private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(25)) {
+if (jj_scan_token(24)) {
jj_scanpos = xsp;
-if (jj_scan_token(26)) return true;
+if (jj_scan_token(25)) return true;
}
return false;
}
@@ -1537,9 +1537,9 @@
private boolean jj_3R_26() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(27)) {
+if (jj_scan_token(26)) {
jj_scanpos = xsp;
-if (jj_scan_token(28)) return true;
+if (jj_scan_token(27)) return true;
}
return false;
}
@@ -1577,9 +1577,9 @@
private boolean jj_3R_23() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(35)) {
+if (jj_scan_token(34)) {
jj_scanpos = xsp;
-if (jj_scan_token(36)) return true;
+if (jj_scan_token(35)) return true;
}
return false;
}
@@ -1592,9 +1592,9 @@
private boolean jj_3R_22() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(33)) {
+if (jj_scan_token(32)) {
jj_scanpos = xsp;
-if (jj_scan_token(34)) return true;
+if (jj_scan_token(33)) return true;
}
return false;
}
@@ -1612,9 +1612,9 @@
private boolean jj_3R_17() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(39)) {
+if (jj_scan_token(38)) {
jj_scanpos = xsp;
-if (jj_scan_token(40)) return true;
+if (jj_scan_token(39)) return true;
}
return false;
}
@@ -1692,9 +1692,9 @@
private boolean jj_3R_15() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(41)) {
+if (jj_scan_token(40)) {
jj_scanpos = xsp;
-if (jj_scan_token(42)) return true;
+if (jj_scan_token(41)) return true;
}
return false;
}
@@ -1809,9 +1809,9 @@
private boolean jj_3R_35() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(37)) {
+if (jj_scan_token(36)) {
jj_scanpos = xsp;
-if (jj_scan_token(38)) return true;
+if (jj_scan_token(37)) return true;
}
if (jj_3R_30()) return true;
return false;
@@ -1847,9 +1847,9 @@
private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(51)) {
+if (jj_scan_token(50)) {
jj_scanpos = xsp;
-if (jj_scan_token(52)) return true;
+if (jj_scan_token(51)) return true;
}
return false;
}
@@ -1857,9 +1857,9 @@
private boolean jj_3R_39() {
Token xsp;
xsp = jj_scanpos;
-if (jj_scan_token(49)) {
+if (jj_scan_token(48)) {
jj_scanpos = xsp;
-if (jj_scan_token(50)) return true;
+if (jj_scan_token(49)) return true;
}
return false;
}
@@ -1916,10 +1916,10 @@
jj_la1_init_1();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe00,0x1800,0x600,0x8000,0x6000,0xfe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x24,0x9d600,0x24,0x8,0x0,0x100,0x9d600,0x1d600,0xc000,};
+ jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff00,0xc00,0x300,0xc000,0x3000,0xff00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4eb00,0x12,0x4eb00,0x12,0x4,0x0,0x80,0x4eb00,0xeb00,0x6000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[]
{0x0,0x0,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x6,0x18,0x1e2000,0x60,0x2088
Re: svn commit: r896589 - in /tomcat/trunk/java/org/apache/el/parser: ELParser.java ELParser.jjt ELParserConstants.java ELParserTokenManager.java ParseException.java Token.java TokenMgrError.java
On 06/01/2010 18:10, ma...@apache.org wrote:
> Author: markt
> Date: Wed Jan 6 18:10:41 2010
> New Revision: 896589
>
> URL: http://svn.apache.org/viewvc?rev=896589&view=rev
> Log: (empty)
>
> --- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
> +++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Wed Jan 6 18:10:41
> 2010
> @@ -353,11 +353,15 @@
> /*
>
> */
> TOKEN :
> {
> + /*
> + * The following definition uses + rather than * in two places to prevent
> + * LITERAL_EXPRESSION matching the empty string that could result in the
> + * Parser entering an infinite loop.
> + */
>< LITERAL_EXPRESSION:
> -((~["\\", "$", "#"])
> - | ("\\" ("\\" | "$" | "#"))
> - | ("$" ~["{", "$"])
> - | ("#" ~["{", "#"])
> +( (~["$", "#", "\\"])* "\\" (["$", "#"])?
> + | (~["$", "#"])* (["$", "#"] ~["{"])
> + | (~["$", "#"])+
I've raised this with the EL spec folks. Hopefully it will get fixed in
a future version.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r896589 - svn:log
Author: markt Revision: 896589 Modified property: svn:log Modified: svn:log at Wed Jan 6 18:14:02 2010 -- --- svn:log (original) +++ svn:log Wed Jan 6 18:14:02 2010 @@ -0,0 +1 @@ +Fix some test failures. '\' should not be skipped in lierals. Align the definition of LiteralExpression with the EL 2.2 spec otherwise parsing errors result. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896594 - /tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Author: markt
Date: Wed Jan 6 18:18:09 2010
New Revision: 896594
URL: http://svn.apache.org/viewvc?rev=896594&view=rev
Log:
Fix the remaining test failures
Modified:
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=896594&r1=896593&r2=896594&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Wed Jan 6
18:18:09 2010
@@ -52,9 +52,10 @@
StringBuilder buf = new StringBuilder(size);
for (int i = 0; i < size; i++) {
char c = image.charAt(i);
-if (c == '\\' && i + 1 < size) {
+if (c == '\\' && i + 2 < size) {
char c1 = image.charAt(i + 1);
-if (c1 == '#' || c1 == '$') {
+char c2 = image.charAt(i + 2);
+if ((c1 == '#' || c1 == '$') && c2 == '{') {
c = c1;
i++;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896595 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml res/tomcat.nsi webapps/ROOT/index.html webapps/ROOT/index.jsp
Author: rjung Date: Wed Jan 6 18:20:46 2010 New Revision: 896595 URL: http://svn.apache.org/viewvc?rev=896595&view=rev Log: Replace a few hard-coded copyright years with current year applied by ant version filter. Backport of r895206. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/res/tomcat.nsi tomcat/tc6.0.x/trunk/webapps/ROOT/index.html tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896595&r1=896594&r2=896595&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 6 18:20:46 2010 @@ -110,13 +110,6 @@ +1: markt, rjung -1: -* Replace a few hard-coded copyright years with - current year applied by ant version filter. - http://svn.apache.org/viewvc?rev=895203&view=rev - http://svn.apache.org/viewvc?rev=895206&view=rev - +1: rjung, kkolinko, markt - -1: - * Allow special characters recognized by the Windows command-line shell to be present in the names of CATALINA_HOME/_BASE and the current directory used to call the Tomcat scripts. Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896595&r1=896594&r2=896595&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 18:20:46 2010 @@ -532,6 +532,7 @@ + @@ -541,6 +542,7 @@ + Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=896595&r1=896594&r2=896595&view=diff == --- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Wed Jan 6 18:20:46 2010 @@ -25,7 +25,7 @@ ;Product information VIAddVersionKey ProductName "Apache Tomcat" VIAddVersionKey CompanyName "Apache Software Foundation" - VIAddVersionKey LegalCopyright "Copyright (c) 1999-2010 The Apache Software Foundation" + VIAddVersionKey LegalCopyright "Copyright (c) 19...@year@ The Apache Software Foundation" VIAddVersionKey FileDescription "Apache Tomcat Installer" VIAddVersionKey FileVersion "2.0" VIAddVersionKey ProductVersion "@VERSION@" Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=896595&r1=896594&r2=896595&view=diff == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Wed Jan 6 18:20:46 2010 @@ -201,7 +201,7 @@ - Copyright © 1999-2010 Apache Software Foundation + Copyright © 19...@year@ Apache Software Foundation All Rights Reserved Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?rev=896595&r1=896594&r2=896595&view=diff == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Wed Jan 6 18:20:46 2010 @@ -216,7 +216,7 @@ - Copyright © 1999-2010 Apache Software Foundation + Copyright © 19...@year@ Apache Software Foundation All Rights Reserved - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896602 - /tomcat/trunk/java/org/apache/el/parser/
Author: markt Date: Wed Jan 6 18:28:02 2010 New Revision: 896602 URL: http://svn.apache.org/viewvc?rev=896602&view=rev Log: Ignore the imtermediate file for the parser generation Modified: tomcat/trunk/java/org/apache/el/parser/ (props changed) Propchange: tomcat/trunk/java/org/apache/el/parser/ -- --- svn:ignore (added) +++ svn:ignore Wed Jan 6 18:28:02 2010 @@ -0,0 +1 @@ +ELParser.jj - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896609 - in /tomcat/tc6.0.x/trunk: build.xml dist.xml extras.xml
Author: rjung Date: Wed Jan 6 18:37:58 2010 New Revision: 896609 URL: http://svn.apache.org/viewvc?rev=896609&view=rev Log: More sync between trunk and tc6: - small change in line order - add missing property Modified: tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/dist.xml tomcat/tc6.0.x/trunk/extras.xml Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896609&r1=896608&r2=896609&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 18:37:58 2010 @@ -35,6 +35,7 @@ + @@ -45,8 +46,8 @@ + - Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=896609&r1=896608&r2=896609&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 6 18:37:58 2010 @@ -35,6 +35,7 @@ + @@ -47,7 +48,6 @@ - Modified: tomcat/tc6.0.x/trunk/extras.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=896609&r1=896608&r2=896609&view=diff == --- tomcat/tc6.0.x/trunk/extras.xml (original) +++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 6 18:37:58 2010 @@ -35,6 +35,7 @@ + @@ -45,8 +46,8 @@ + - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896620 - /tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Author: markt
Date: Wed Jan 6 18:51:24 2010
New Revision: 896620
URL: http://svn.apache.org/viewvc?rev=896620&view=rev
Log:
Add a test case for bug 48112 (note this passes - need to check when used in a
JSP)
Modified:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
Modified: tomcat/trunk/test/org/apache/el/TestELEvaluation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?rev=896620&r1=896619&r2=896620&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELEvaluation.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Wed Jan 6 18:51:24
2010
@@ -18,9 +18,11 @@
package org.apache.el;
import java.io.File;
+import java.lang.reflect.Method;
import java.util.Date;
import javax.el.ValueExpression;
+import javax.el.FunctionMapper;
import org.apache.el.ExpressionFactoryImpl;
import org.apache.el.lang.ELSupport;
@@ -90,6 +92,11 @@
assertEquals("\"\\", evaluateExpression("${\"\\\"\"}"));
}
+public void testParserFunction() {
+// bug 48112
+assertEquals("{world}", evaluateExpression("${fn:trim('{world}')}"));
+}
+
private void compareBoth(String msg, int expected, Object o1, Object o2){
int i1 = ELSupport.compare(o1, o2);
int i2 = ELSupport.compare(o2, o1);
@@ -116,9 +123,33 @@
private String evaluateExpression(String expression) {
ELContextImpl ctx = new ELContextImpl();
+ctx.setFunctionMapper(new FMapper());
ExpressionFactoryImpl exprFactory = new ExpressionFactoryImpl();
ValueExpression ve = exprFactory.createValueExpression(ctx, expression,
String.class);
return (String) ve.getValue(ctx);
}
+
+public static class FMapper extends FunctionMapper {
+
+@Override
+public Method resolveFunction(String prefix, String localName) {
+if ("trim".equals(localName)) {
+Method m;
+try {
+m = this.getClass().getMethod("trim", String.class);
+return m;
+} catch (SecurityException e) {
+// Ignore
+} catch (NoSuchMethodException e) {
+// Ignore
+}
+}
+return null;
+}
+
+public static String trim(String input) {
+return input.trim();
+}
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896622 - /tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Author: markt
Date: Wed Jan 6 19:04:32 2010
New Revision: 896622
URL: http://svn.apache.org/viewvc?rev=896622&view=rev
Log:
Prevent NPE in emebedded case when no web.xml is provided at all
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=896622&r1=896621&r2=896622&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Wed Jan 6
19:04:32 2010
@@ -77,9 +77,12 @@
try {
webXml = new WebXml(ctxt);
-ParserUtils pu = new ParserUtils();
-TreeNode webApp = pu.parseXMLDocument(webXml.getSystemId(),
-webXml.getInputSource());
+TreeNode webApp = null;
+if (webXml.getInputSource() != null) {
+ParserUtils pu = new ParserUtils();
+webApp = pu.parseXMLDocument(webXml.getSystemId(),
+webXml.getInputSource());
+}
if (webApp == null
|| getVersion(webApp) < 2.4) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r896626 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Jan 6 19:15:25 2010 New Revision: 896626 URL: http://svn.apache.org/viewvc?rev=896626&view=rev Log: Proposal. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=896626&r1=896625&r2=896626&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 6 19:15:25 2010 @@ -145,3 +145,14 @@ We should not vote before 1.1.19 is officially released. +1: -1: + +* Remove hard coded version numbers and instead apply version filter + already defined in ant scripts. + Backport from trunk of + http://svn.apache.org/viewvc?rev=r711934&view=rev + http://svn.apache.org/viewvc?rev=r712053&view=rev + Complete patch applicable to TC6: + http://people.apache.org/~rjung/patches/tc6-version_filter.patch + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48169] two second delay for cgi scripts mixed with mod_jk
https://issues.apache.org/bugzilla/show_bug.cgi?id=48169 --- Comment #4 from Troy Bowman 2010-01-06 16:51:04 UTC --- (In reply to comment #3) > Can you check if the > http://svn.apache.org/viewvc?rev=892725&view=rev > fixes the issue? > > It uses SOCK_CLOEXEC|FD_CLOEXEC so it should close all sockets on fork() Indeed it does. Nice and speedy, no delay. Thanks so much for fixing it! When's the next release? :) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47462] The annotation doesn't become effective.(metadata-complete="false" is not effective.)
https://issues.apache.org/bugzilla/show_bug.cgi?id=47462 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Component|Catalina|Catalina Version|5.5.28 |6.0.20 Resolution||FIXED Product|Tomcat 5|Tomcat 6 Target Milestone|--- |default --- Comment #9 from Konstantin Kolinko 2010-01-06 18:06:55 UTC --- metadata-complete is @since Servlet 2.5, so this issue is not applicable to Tomcat 5.5. Closing as FIXED in TC 6. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48498] New: 6.0.22RC: ArrayIndexOutOfBoundsException from Jasper when compilation error inside a CDATA block
https://issues.apache.org/bugzilla/show_bug.cgi?id=48498 Summary: 6.0.22RC: ArrayIndexOutOfBoundsException from Jasper when compilation error inside a CDATA block Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Jasper AssignedTo: dev@tomcat.apache.org ReportedBy: knst.koli...@gmail.com Created an attachment (id=24808) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24808) /webapps/examples/WEB-INF/tags/panel.tagx Steps to reproduce: 1. Remove /WEB-INF/tags/panel.tag from the Tomcat Examples webapp and replace it with the attached XML Tag file, panel.tagx 2. Visit the following page: http://localhost:8080/examples/jsp/jsp2/tagfiles/panel.jsp 3. The page contains a scriptlet, with a CDATA block that produces a compilatin error. Expected result: Compilation error being reported for line 39, Integer.parseInt(10); Actual result: java.lang.ArrayIndexOutOfBoundsException: 46 org.apache.jasper.compiler.JavacErrorDetail.(JavacErrorDetail.java:111) 4. If I add sufficient number of empty lines after the CDATA block, ArrayIndexOutOfBoundsException disappears and I can see the compiler error, but the error lines shown are wrong. The shown lines are below the actual location of the error. It looks like this offset in line numbers is due to the size of the CDATA block. Full stacktrace of the above ArrayIndexOutOfBoundsException exception: java.lang.ArrayIndexOutOfBoundsException: 46 org.apache.jasper.compiler.JavacErrorDetail.(JavacErrorDetail.java:111) org.apache.jasper.compiler.ErrorDispatcher.createJavacError(ErrorDispatcher.java:533) org.apache.jasper.compiler.JDTCompiler$2.acceptResult(JDTCompiler.java:377) org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:398) org.apache.jasper.compiler.JDTCompiler.generateClass(JDTCompiler.java:429) org.apache.jasper.compiler.Compiler.compile(Compiler.java:334) org.apache.jasper.compiler.Compiler.compile(Compiler.java:312) org.apache.jasper.compiler.Compiler.compile(Compiler.java:299) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:589) org.apache.jasper.servlet.JspServletWrapper.loadTagFile(JspServletWrapper.java:215) org.apache.jasper.compiler.TagFileProcessor.loadTagFile(TagFileProcessor.java:625) org.apache.jasper.compiler.TagFileProcessor.access$000(TagFileProcessor.java:52) org.apache.jasper.compiler.TagFileProcessor$TagFileLoaderVisitor.visit(TagFileProcessor.java:685) org.apache.jasper.compiler.Node$CustomTag.accept(Node.java:1530) org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2411) org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2417) org.apache.jasper.compiler.Node$Root.accept(Node.java:495) org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2361) org.apache.jasper.compiler.TagFileProcessor.loadTagFiles(TagFileProcessor.java:703) org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:195) org.apache.jasper.compiler.Compiler.compile(Compiler.java:332) org.apache.jasper.compiler.Compiler.compile(Compiler.java:312) org.apache.jasper.compiler.Compiler.compile(Compiler.java:299) org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:589) org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:317) org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:313) org.apache.jasper.servlet.JspServlet.service(JspServlet.java:260) javax.servlet.http.HttpServlet.service(HttpServlet.java:717) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48498] 6.0.22RC: ArrayIndexOutOfBoundsException from Jasper when compilation error inside a CDATA block
https://issues.apache.org/bugzilla/show_bug.cgi?id=48498 --- Comment #1 from Konstantin Kolinko 2010-01-06 19:47:10 UTC --- Created an attachment (id=24809) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24809) /webapps/examples/jsp/jsp2/jspx/basic.jspx One more example - a JSP page. Location: /webapps/examples/jsp/jsp2/jspx/basic.jspx HTTP Address: http://localhost:8080/examples/jsp/jsp2/jspx/basic.jspx Displays java.lang.ArrayIndexOutOfBoundsException: 57 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
