Regarding JAAS logout patch (for bug 39231)
The following patch is currently in voting for 5.5 and 6.0 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231 http://svn.apache.org/viewvc?rev=791900&view=rev http://svn.apache.org/viewvc?rev=792446&view=rev (Filip's suggestion) JAAS LoginContext expects a call to logout() I have some comments on it. 1. It changes signature of JAASRealm.createPrincipal(), adding the third argument, and that will break classes that override that method. While evaluating this case I stumbled upon a library that will be broken by this change: JOSSO (Java Open Single Sign-On Project). Here is their instruction for configuring it on Tomcat 6: http://www.josso.org/confluence/display/JOSSO1/Tomcat+6.0 Here are the sources: https://josso.svn.sourceforge.net/svnroot/josso/josso1/trunk/agents/josso-tomcat60-agent/src/main/java/org/josso/tc60/agent/jaas/ - see the CatalinaJAASRealm and CatalinaSSOUser classes. I am not sure that JAASRealm is part of our official API, but if we can avoid breakage, it is better to do so. The way that I see to implement our change and to be compatible with their code is to add a setter to GenericPrincipal that will accept LoginContext, instead of passing that argument to the constructor. 2. This logout feature, that this patch implements, - it s actually more like a cleanup. All the LoginModule s that I've seen do on logout() is clearing assigned roles and destroying credentials. That is good, because it won't have side effects. (If there were any, this feature would have to be configurable). Though "logout" is a bit too loud name for it. Documentation on implementing LoginModule#logout() is here: http://java.sun.com/javase/6/docs/technotes/guides/security/jaas/JAASLMDevGuide.html#logout Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: local changes on /www/tomcat.apache.org
2009/8/13 Konstantin Kolinko : > 2009/8/13 Konstantin Kolinko : >> 26th of March, 2009 is certainly a Thursday this year, not a Friday. > Thursday >> >> Looks like someone was making corrections in a rush before the event. >> >> By the way, "Apache Tomcat - Apache Tomcat" (repeated twice) is a lame >> title. And we have it on some other pages as well, like >> Apache Tomcat - Apache Tomcat -- Which Version Do I Want? >> http://tomcat.apache.org/whichversion.html >> >> 2009/8/13 Filip Hanik - Dev Lists : >>> notice the title is removed >>> >>> fha...@minotaur> svn diff index.html >>> Index: index.html >>> I corrected the week day and page titles in SVN. I see that 5.5.28 is already mentioned on the download page, so I went on to "svn revert index.html", "svn up" the site. Will there be an official announcement for 5.5.28? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804559 [3/3] - in /tomcat/site/trunk: docs/ xdocs/
Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Sun Aug 16 04:35:08 2009 @@ -2,9 +2,8 @@ -Marc A. Saegesser -Yoav Shapira -Apache Tomcat +Apache Tomcat Project +Welcome Modified: tomcat/site/trunk/xdocs/legal.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/legal.xml (original) +++ tomcat/site/trunk/xdocs/legal.xml Sun Aug 16 04:35:08 2009 @@ -3,7 +3,7 @@ Apache Tomcat Project -Apache Tomcat -- Legal Stuff They Make Us Say +Legal Stuff They Make Us Say Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Sun Aug 16 04:35:08 2009 @@ -2,7 +2,7 @@ Apache Tomcat Team -Apache Tomcat -- Mailing Lists +Mailing Lists Modified: tomcat/site/trunk/xdocs/migration.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/migration.xml (original) +++ tomcat/site/trunk/xdocs/migration.xml Sun Aug 16 04:35:08 2009 @@ -3,7 +3,7 @@ Remy Maucherat -Apache Tomcat -- Migration Guide +Migration Guide Modified: tomcat/site/trunk/xdocs/resources.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/resources.xml (original) +++ tomcat/site/trunk/xdocs/resources.xml Sun Aug 16 04:35:08 2009 @@ -3,7 +3,7 @@ Remy Maucherat -Apache Tomcat Resources +Resources Modified: tomcat/site/trunk/xdocs/security-impact.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-impact.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/security-impact.xml (original) +++ tomcat/site/trunk/xdocs/security-impact.xml Sun Aug 16 04:35:08 2009 @@ -3,7 +3,7 @@ Apache Tomcat Project -Apache Tomcat -- Security Impact Levels +Security Impact Levels Modified: tomcat/site/trunk/xdocs/security.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/security.xml (original) +++ tomcat/site/trunk/xdocs/security.xml Sun Aug 16 04:35:08 2009 @@ -3,7 +3,7 @@ Apache Tomcat Project -Apache Tomcat -- Reporting Security Problems +Reporting Security Problems Modified: tomcat/site/trunk/xdocs/svn.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/svn.xml (original) +++ tomcat/site/trunk/xdocs/svn.xml Sun Aug 16 04:35:08 2009 @@ -2,7 +2,7 @@ -Apache Tomcat -- Subversion Repository Access +Subversion Repository Access Modified: tomcat/site/trunk/xdocs/whichversion.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/whichversion.xml (original) +++ tomcat/site/trunk/xdocs/whichversion.xml Sun Aug 16 04:35:08 2009 @@ -4,7 +4,7 @@ Marc A. Saegesser Yoav Shapira -Apache Tomcat -- Which Version Do I Want? +Which Version Do I Want? Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=804559&r1=804558&r2=804559&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Sun Aug 16 04:35:08 2009 @@ -2,7 +2,7 @@ -Apache Tomcat -- Who We Are +Who We Are - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804558 - /tomcat/site/trunk/build.xml
Author: kkolinko Date: Sun Aug 16 04:02:57 2009 New Revision: 804558 URL: http://svn.apache.org/viewvc?rev=804558&view=rev Log: Fix Ant warning Modified: tomcat/site/trunk/build.xml Modified: tomcat/site/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=804558&r1=804557&r2=804558&view=diff == --- tomcat/site/trunk/build.xml (original) +++ tomcat/site/trunk/build.xml Sun Aug 16 04:02:57 2009 @@ -20,14 +20,14 @@ - - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804557 - /tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
Author: kkolinko Date: Sun Aug 16 03:39:52 2009 New Revision: 804557 URL: http://svn.apache.org/viewvc?rev=804557&view=rev Log: Correct template for HTML META tag. It does not have 'value' attribute, but has 'content'. Also, do not publish e-mails. Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=804557&r1=804556&r2=804557&view=diff == --- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original) +++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Sun Aug 16 03:39:52 2009 @@ -47,8 +47,10 @@ - - + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804556 - /tomcat/site/trunk/xdocs/whoweare.xml
Author: kkolinko Date: Sun Aug 16 03:29:21 2009 New Revision: 804556 URL: http://svn.apache.org/viewvc?rev=804556&view=rev Log: Correct name, based on its mention in the following file: http://svn.apache.org/repos/asf/tomcat/archive/tc3.3.x/trunk/container/KEYS Modified: tomcat/site/trunk/xdocs/whoweare.xml Modified: tomcat/site/trunk/xdocs/whoweare.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whoweare.xml?rev=804556&r1=804555&r2=804556&view=diff == --- tomcat/site/trunk/xdocs/whoweare.xml (original) +++ tomcat/site/trunk/xdocs/whoweare.xml Sun Aug 16 03:29:21 2009 @@ -135,7 +135,7 @@ Pierre Delisle (pierred at apache.org), David Lawrence Isaacs (larryi at apache.org), Arieh Markel (arieh at apache.org), -Marc Saegesse (marcsaeg at apache.org), +Marc A. Saegesser (marcsaeg at apache.org), Dan Milstein (danmil at apache.org), Shai Fultheim (shai at apache.org), Kief Morris (kief at apache.org), - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804553 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml
Author: kkolinko Date: Sun Aug 16 02:49:04 2009 New Revision: 804553 URL: http://svn.apache.org/viewvc?rev=804553&view=rev Log: Update wrong day of week Modified: tomcat/site/trunk/docs/index.html tomcat/site/trunk/xdocs/index.xml Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=804553&r1=804552&r2=804553&view=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Sun Aug 16 02:49:04 2009 @@ -276,7 +276,7 @@ http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch all Tomcat talks online. In addition to the various keynote sessions, and other technical talks, - the following talks related to Tomcat will be streamed on Friday, + the following talks related to Tomcat will be streamed on Thursday, the 26th of March. Modified: tomcat/site/trunk/xdocs/index.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=804553&r1=804552&r2=804553&view=diff == --- tomcat/site/trunk/xdocs/index.xml (original) +++ tomcat/site/trunk/xdocs/index.xml Sun Aug 16 02:49:04 2009 @@ -51,7 +51,7 @@ http://www.eu.apachecon.com/c/aceu2009/about/videoStreaming";>watch all Tomcat talks online. In addition to the various keynote sessions, and other technical talks, - the following talks related to Tomcat will be streamed on Friday, + the following talks related to Tomcat will be streamed on Thursday, the 26th of March. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47566] Update to NSIS 2.45
https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Konstantin Kolinko 2009-08-15 19:40:05 PDT --- Applied to 5.5, 6.0. Will be in 5.5.29, 6.0.21. -- 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: r804551 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.properties.default container/webapps/docs/changelog.xml
Author: kkolinko
Date: Sun Aug 16 02:35:17 2009
New Revision: 804551
URL: http://svn.apache.org/viewvc?rev=804551&view=rev
Log:
Apply https://issues.apache.org/bugzilla/show_bug.cgi?id=47566
Update to NSIS 2.45
NSIS 2.45 Release notes:
http://sourceforge.net/project/shownotes.php?release_id=688043
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=804551&r1=804550&r2=804551&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Aug 16 02:35:17 2009
@@ -68,16 +68,6 @@
+1: kkolinko
-1:
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=47566
- Update to NSIS 2.45
- http://svn.apache.org/viewvc?rev=797596&view=rev
- +1: kkolinko, rjung, markt
- -1:
- kkolinko: Now it also requires the following patch, but I hope that
- sourceforge.net will fix their error:
-http://svn.apache.org/viewvc?rev=797600&view=rev
- markt: +1 to the additional change if still required
-
* Improve build.properties comment in ant build files.
Backport from trunk, only the part on build.xml.
http://svn.apache.org/viewvc?rev=797425&view=rev
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=804551&r1=804550&r2=804551&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Sun Aug 16 02:35:17 2009
@@ -204,12 +204,12 @@
rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip
# - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.44
+nsis.home=${base.path}/nsis-2.45
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.44.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
# - Struts, version 1.2.4 or later -
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=804551&r1=804550&r2=804551&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Aug 16
02:35:17 2009
@@ -46,6 +46,9 @@
install, and allow it to automatically select the correct one for the
current platform. (kkolinko/mturk)
+
+Update Windows installer to use NSIS 2.45. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804550 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: kkolinko Date: Sun Aug 16 02:27:48 2009 New Revision: 804550 URL: http://svn.apache.org/viewvc?rev=804550&view=rev Log: Apply https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Update to NSIS 2.45 NSIS 2.45 Release notes: http://sourceforge.net/project/shownotes.php?release_id=688043 Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 16 02:27:48 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797607 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797596,797607 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=804550&r1=804549&r2=804550&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 16 02:27:48 2009 @@ -172,17 +172,6 @@ I think it would be nice to improve in a second step by resizing the array according to the class size. AFAIK it's not a performance critical path. -* https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 - Update to NSIS 2.45 - http://svn.apache.org/viewvc?rev=797596&view=rev - +1: kkolinko, rjung, markt - -1: - kkolinko: Now it also requires the following patch, but I hope that - sourceforge.net will fix their error: -http://svn.apache.org/viewvc?rev=797600&view=rev - rjung: +1 for both as long as the problem lasts (SF-DL still seems to be broken). - markt: ditto - * Port Active Directory improvements to JNDIREalm from trunk Patch testing successfully by willing volunteer on the users list http://people.apache.org/~markt/patches/2009-08-06-ADforJNDIRealm.patch Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=804550&r1=804549&r2=804550&view=diff == --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default S
svn commit: r804549 - /tomcat/trunk/build.properties.default
Author: kkolinko Date: Sun Aug 16 02:17:52 2009 New Revision: 804549 URL: http://svn.apache.org/viewvc?rev=804549&view=rev Log: The problem at sourceforge was solved. Revert to the original configuration, but leave a comment there. Modified: tomcat/trunk/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=804549&r1=804548&r2=804549&view=diff == --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Sun Aug 16 02:17:52 2009 @@ -45,11 +45,10 @@ base-commons.loc=http://archive.apache.org/dist/commons base-tomcat.loc=http://archive.apache.org/dist/tomcat -#base-sf.loc=http://downloads.sourceforge.net -# Temporarily use a mirror, while there is a problem -# with downloads.sourceforge.net -# https://sourceforge.net/apps/trac/sourceforge/ticket/2628 -base-sf.loc=http://sunet.dl.sourceforge.net +base-sf.loc=http://downloads.sourceforge.net + +# Mirror, was used when there were problems with the main SF downloads site +# base-sf.loc=http://sunet.dl.sourceforge.net # - Commons Logging, version 1.1 or later - commons-logging-version=1.1.1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804547 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Aug 16 02:08:44 2009 New Revision: 804547 URL: http://svn.apache.org/viewvc?rev=804547&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=804547&r1=804546&r2=804547&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 16 02:08:44 2009 @@ -288,7 +288,7 @@ This ensures that code that actually executes Class.forName(...,classloader) during this phase works properly. http://svn.apache.org/viewvc?rev=804057&view=rev - +1: fhanik, markt + +1: fhanik, markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804545 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Aug 16 01:58:37 2009 New Revision: 804545 URL: http://svn.apache.org/viewvc?rev=804545&view=rev Log: Add missed part of the patch 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=804545&r1=804544&r2=804545&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Aug 16 01:58:37 2009 @@ -280,6 +280,7 @@ - tested in normal operation on windows, with unpackWARs="true" and "false" - test on linux in normal and failure modes http://svn.apache.org/viewvc?rev=804462&view=rev + http://svn.apache.org/viewvc?rev=804544&view=rev +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804544 - /tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Author: kkolinko
Date: Sun Aug 16 01:55:25 2009
New Revision: 804544
URL: http://svn.apache.org/viewvc?rev=804544&view=rev
Log:
Return 'false' if nested copyDir call failed.
It is part of the patch for issue 45403 that was applied in rev.804462
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=804544&r1=804543&r2=804544&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sun Aug 16
01:55:25 2009
@@ -1163,7 +1163,8 @@
return false;
} else if (object instanceof DirContext) {
currentFile.mkdir();
-copyDir((DirContext) object, currentFile);
+if (!copyDir((DirContext) object, currentFile))
+return false;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: /dev/urandom usage
OK, I looked at this some more.
What's really happening is ManagerBase is using /dev/urandom if it exists in
getRandomBytes(). getRandom() is just a fallback if devRandomSource
(/dev/urandom) doesn't exist.
>From digging deeper, it looks like StandardContext instantiates a copy of
StandardManager(). So, every context is opening the file.
Looking at StandardManager.stop() at around line 690, there's some code that
null's out the random variable.
It seems like this doesn't take into account the use of /dev/urandom. So, a
call to StandardManager.stop() doesn't close the file handle. Shouldn't
there be something like:
if (randomIS!=null) {
try {
randomIS.close();
} catch (IOException ioe) {
} finally {
randomIS=null;
}
}
Inserted into either StandardManager.stop() or ManagerBase.destroy()?
George Sexton
MH Software, Inc.
http://www.mhsoftware.com/
Voice: 303 438 9585
> -Original Message-
> From: George Sexton [mailto:geor...@mhsoftware.com]
> Sent: Friday, August 14, 2009 8:40 PM
> To: 'Tomcat Developers List'
> Subject: RE: /dev/urandom usage
>
> > -Original Message-
> > From: Mark Thomas [mailto:ma...@apache.org]
> > Sent: Friday, August 14, 2009 5:57 PM
> > To: Tomcat Developers List
> > Subject: Re: /dev/urandom usage
> >
> > George Sexton wrote:
> > > I've got a question and it's kind of deep developer question.
> > >
> > > I was poking around today looking at my tomcat instance running
> under
> > Linux.
> > >
> > > I was looking in the /proc//fd directory, which is the list of
> > file
> > > descriptors open by my servlet application.
> > >
> > > There are around 1400 open file descriptors. What I don't
> understand
> > is why
> > > there are some 800+ file descriptors that are open to /dev/urandom.
> > On this
> > > particular host there are some 400 configured hosts/contexts.
> > >
> > > On another server, there are 1100 file descriptors open to
> > /dev/urandom. For
> > > this server, there are around 200 configured hosts/contexts.
> > >
> > > I'm using Sun JDK 1.6.0_14 on OpenSUSE 11.1. One machine is amd64
> > > architecture, while the other is i386.
> > >
> > > Does anyone have any idea what could be causing this? It seems kind
> > of
> > > strange to have 800-1200 file descriptors open to one pseudo file.
> >
> > Take a look at ManagerBase.getRandom(). The probably explains the
> > majority of it.
> >
> > Mark
>
> H. You'll have to execuse me if this is a dumb question, but does
> that
> mean that each session is creating its own instance of
> java.security.SecureRandom, and each instance of
> java.security.SecureRandom
> is opening /dev/urandom?
>
>
>
> George Sexton
> MH Software, Inc.
> http://www.mhsoftware.com/
> Voice: 303 438 9585
>
>
> -
> 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
DO NOT REPLY [Bug 40001] HTML pages should not use GET to restart web-apps.
https://issues.apache.org/bugzilla/show_bug.cgi?id=40001 lucenebugs2...@danielnaber.de changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #5 from lucenebugs2...@danielnaber.de 2009-08-15 15:21:53 PDT --- Setting back to "NEW" as requested by the instructions. -- 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 40001] HTML pages should not use GET to restart web-apps.
https://issues.apache.org/bugzilla/show_bug.cgi?id=40001 --- Comment #4 from lucenebugs2...@danielnaber.de 2009-08-15 15:20:41 PDT --- Created an attachment (id=24139) suggested fix This patch changes the reload/start/stop/undeploy links to buttons and makes sure the servlet only reacts to POST requests. It also improves the text of the Javascript confirmation dialog a bit. -- 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] remove worker based connector thread pools in trunk
2009/8/14 Filip Hanik - Dev Lists : > On 08/14/2009 10:48 AM, Costin Manolache wrote: >> >> +1 - Executor seems the right interface, didn't exist when workers were >> started - ifanyone needs the pool behavior it can probably be implemented >> as >> an Executor. >> >> I assume you'll have some way to configure what kind of executor ? >> > > Yes we do, the NIO connector doesn't use workers anymore. It can use an > internal executor, or an external one. Both are configurable through > server.xml, and the config will not change at all. If you take a 6.0 config, > it would still work. > Furthermore, there is some really cool stuff we can do with executors, such > as even with the BIO connector, we can do keep alives and and still rotate > the sockets among the available threads. > +1 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Eclipse project file for tc5.5.x
Hi! I have prepared Eclipse project file to be put into the root folder of tc5.5, like we have that in tc6.0 and trunk. If anyone is interested, I put it here: http://people.apache.org/~kkolinko/2009-08-15_tc55_eclipse_project/ (just rename _classpath -> .classpath, _project -> .project) I just combined the .classpath files from /build, /container, etc. subfolders. Comparing with creating the project from scratch the tricky part is that some class path entries have excludes, and some sources are not included at all (at least I know about container/modules/groupcom/ being omitted). I think that we can safely remove the following packages from the source tree: org/apache/coyote/tomcat3/ org/apache/coyote/tomcat4/ org/apache/ajp/tomcat33/ org/apache/ajp/tomcat4/ Here is my +1 to remove them. I am not sure about the following ones: org/apache/jk/config/ org/apache/tomcat/util/net/puretls/ org/apache/naming/factory/MailSessionFactory.java|org/apache/naming/factory/SendMailFactory.java I have nothing against keeping puretls code. The project goes fine for me, though there are 6 warnings between jsr152 and jsr154 about duplicate resources, like this one: "The resource is a duplicate of servletapi/jsr152/src/share/dtd/jsp_2_0.xsd and was not copied to the output folder jsp_2_0.xsd Path: /tomcat55/servletapi/jsr154/src/share/dtd/jsp_2_0.xsd " Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r804530 - /tomcat/tc5.5.x/trunk/
Mark, you could put your output into .settings/output, like the 6.0.x project does. ;) Anyway, I do not mind against this svn:ignore. It does no harm. 2009/8/16 : > Author: markt > Date: Sat Aug 15 20:44:01 2009 > New Revision: 804530 > > URL: http://svn.apache.org/viewvc?rev=804530&view=rev > Log: > Add another ignore for Eclipse > > Modified: > tomcat/tc5.5.x/trunk/ (props changed) > > Propchange: tomcat/tc5.5.x/trunk/ > -- > --- svn:ignore (original) > +++ svn:ignore Sat Aug 15 20:44:01 2009 > @@ -1,3 +1,4 @@ > .classpath > .project > .settings > +bin > > > > - > 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: svn commit: r803794 - /tomcat/tc6.0.x/trunk/STATUS.txt
2009/8/15 Mark Thomas : > kkoli...@apache.org wrote: >> + Note: >> + - I cannot test bug 45403 on Windows, as it is Un*x-specific > > I assume you mean that you haven't been able to test this on *nix. If > not, ignore most of what I have written below :) > > There are a couple of options here. > As an Apache committer, you can apply for a full MSDN license. This > should come up again shortly as the current licenses expire in November. > You could then use MS's virtual server. > > I use VMWare Workstation (which you have to pay for) but VMWare server > is available for free and should do what you need to do to test stuff on > *nix. > Thank you for your suggestions, Mark. It is useful information, I haven't heard about that MSDN opportunity before. Let's see if I will need that, I do not right now. I am using VMWare Player (the free one), and have two different Linux VMs to run with it. Maybe I shouldn't be lazy to fire up one of them next time. Thanks for testing. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804532 - /tomcat/tc5.5.x/trunk/connectors/jni/
Author: markt Date: Sat Aug 15 20:47:12 2009 New Revision: 804532 URL: http://svn.apache.org/viewvc?rev=804532&view=rev Log: Ignore an output directory Modified: tomcat/tc5.5.x/trunk/connectors/jni/ (props changed) Propchange: tomcat/tc5.5.x/trunk/connectors/jni/ -- --- svn:ignore (added) +++ svn:ignore Sat Aug 15 20:47:12 2009 @@ -0,0 +1 @@ +dist - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804530 - /tomcat/tc5.5.x/trunk/
Author: markt Date: Sat Aug 15 20:44:01 2009 New Revision: 804530 URL: http://svn.apache.org/viewvc?rev=804530&view=rev Log: Add another ignore for Eclipse Modified: tomcat/tc5.5.x/trunk/ (props changed) Propchange: tomcat/tc5.5.x/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Aug 15 20:44:01 2009 @@ -1,3 +1,4 @@ .classpath .project .settings +bin - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43656] ELSupport.coerceToType modifies BigDecimal Values
https://issues.apache.org/bugzilla/show_bug.cgi?id=43656 --- Comment #17 from Mark Thomas 2009-08-15 20:55:36 BST --- Can you attach the simplest JSP that exhibits this error? -- 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 47688] Documentation update for BUILDING.txt
https://issues.apache.org/bugzilla/show_bug.cgi?id=47688 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2009-08-15 19:45:40 BST --- Patch applied. Will be in 5.5.29 onwards. 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: r804514 - /tomcat/tc5.5.x/trunk/build/BUILDING.txt
Author: markt
Date: Sat Aug 15 18:45:24 2009
New Revision: 804514
URL: http://svn.apache.org/viewvc?rev=804514&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47688
Patch provided by sebb, with minor mods for line length
Modified:
tomcat/tc5.5.x/trunk/build/BUILDING.txt
Modified: tomcat/tc5.5.x/trunk/build/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/BUILDING.txt?rev=804514&r1=804513&r2=804514&view=diff
==
--- tomcat/tc5.5.x/trunk/build/BUILDING.txt (original)
+++ tomcat/tc5.5.x/trunk/build/BUILDING.txt Sat Aug 15 18:45:24 2009
@@ -28,6 +28,11 @@
(0) Download and Install a Java Development Kit
+* The default distribution of Tomcat 5.5.x requires a 5.0 or later JDK.
+ Tomcat can be built using a 1.4.x JDK but you will need to copy the contents
+ of the compat directory (created by the build process) to your build
directory
+ before Tomcat will start.
+
* If the JDK is already installed, skip to (1).
* Download a Java Development Kit (JDK) release (version 1.4.x or later) from:
@@ -64,6 +69,9 @@
(2) Install Subversion 1.3.x or later on your computer
+* Subversion is only needed if you wish to checkout the source from SVN.
+ It is not needed when building Tomcat from source.
+
* If Subversion 1.3.x or later is already installed on your computer, skip to
(3).
* Download a binary distribution of Subversion 1.3.x or later from:
@@ -78,37 +86,24 @@
of the subversion release directory. This makes the "svn" command
available, which will be used to checkout the tomcat sources.
-* NOTE: If you're running behind a proxy server, the SVN checkout of Tomcat
- source code may fail. See http://subversion.tigris.org/faq.html#proxy for
- ways to work around this.
-
(3) Building Tomcat 5.5
-(3.1) Download main build script and build binary distribution
-
-* Download the main build.xml script from:
- http://tomcat.apache.org/tomcat-5.5-doc/build.xml
-
-* Create a new directory, and copy the newly download build.xml to it. This
- directory will be referred to as the ${tomcat.source} directory in the rest
- of this document
-
-(3.2) Building
-
-* Go to that directory, and do:
-
-cd ${tomcat.source}
-ant
+* This assumes that the Tomcat source is available in the directory tree
starting
+ at ${tomcat.source}.
+
+cd ${tomcat.source}/build
+ant download
+ant [deploy]
* NOTE: Users accessing the Internet through a proxy must use a properties
file to indicate to Ant the proxy configuration. Read below.
-* WARNING: Running this command will checkout the Tomcat 5 sources from the
Apache
- source code repository, as
- well as download binaries to the /usr/share/java directory. Make sure this is
- appropriate to do on your computer. On Windows, this usually corresponds
- to the "C:\usr\share\java" directory, unless Cygwin is used. Read below to
- customize the directory used to download the binaries.
+* WARNING:
+ Running the "ant download" command will download binaries to the
+ /usr/share/java directory. Make sure this is appropriate to do on your
+ computer. On Windows, this usually corresponds to the "C:\usr\share\java"
+ directory, unless Cygwin is used. Read below to customize the directory used
+ to download the binaries.
* The build can be controlled by creating a ${tomcat.source}/build.properties
file, and adding the following content to it:
@@ -131,14 +126,15 @@
To do this, execute the following commands:
cd ${tomcat.source}
-ant checkout
+svn update
+[This does not apply if you are building Tomcat from a source archive].
(5) Rebuilds
For a quick rebuild of only modified code you can use
-cd ${tomcat.source}
+cd ${tomcat.source}/build
ant build
In addition, "ant build-depends" will build packages that
@@ -153,8 +149,8 @@
directory for running instructions. To build the compat
package, do
-cd ${tomcat.source}
-ant build-compat
+cd ${tomcat.source}/build
+ant compat
(7) Building the servlet and jsp API documentation
@@ -168,3 +164,10 @@
cd ${tomcat.source}/build
ant release
+Note that this deletes any existing build output.
+
+(9) Running tests
+
+do
+cd ${tomcat.source}/build
+ant clean-tester run-tester
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 43656] ELSupport.coerceToType modifies BigDecimal Values
https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
Luke Kolin changed:
What|Removed |Added
Status|RESOLVED|REOPENED
Resolution|FIXED |
--- Comment #16 from Luke Kolin 2009-08-15 11:43:16 PDT ---
This does not appear to be fixed, but I'm not sure if the problem rests with
the code here or JSPC. I get the following error when executing a JSP:
Cannot convert 0 of type class java.lang.Long to class java.lang.Number
java.lang.IllegalArgumentException
org.apache.el.lang.ELSupport.coerceToNumber(ELSupport.java:250)
org.apache.el.lang.ELSupport.coerceToNumber(ELSupport.java:257)
org.apache.el.lang.ELSupport.coerceToType(ELSupport.java:351)
org.apache.el.ValueExpressionImpl.getValue(ValueExpressionImpl.java:188)
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:935)
org.deltava.jsp.admin.diagnostics_jsp._jspx_meth_fmt_005fint_005f8(diagnostics_jsp.java)
org.deltava.jsp.admin.diagnostics_jsp._jspx_meth_el_005ftable_005f0(diagnostics_jsp.java)
Looking at the the method call, I see this in the JSP source:
_jspx_th_fmt_005fint_005f8.setValue((java.lang.Number)
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate("${mapsAPIUsage}",
java.lang.Number.class, (PageContext)_jspx_page_context, null, false));
The ELSupport.coerceToNumber(Number, Class) method appears to fail if the Class
specified is java.lang.Number; there's no way it can execute without throwing
an exception.
--
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 41824] Unable to use nested type in TLD
https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2009-08-15 19:37:59 BST --- This has been fixed in 5.5.x and will be included in 5.5.29 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: r804512 - in /tomcat/tc5.5.x/trunk: STATUS.txt container/webapps/docs/changelog.xml jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Author: markt
Date: Sat Aug 15 18:37:34 2009
New Revision: 804512
URL: http://svn.apache.org/viewvc?rev=804512&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824
Need to use canonical rather than binary form when writing code
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=804512&r1=804511&r2=804512&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Aug 15 18:37:34 2009
@@ -78,12 +78,6 @@
http://svn.apache.org/viewvc?rev=797600&view=rev
markt: +1 to the additional change if still required
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824
- Need to use canonical rather than binary form when writing code
- http://svn.apache.org/viewvc?rev=797607&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Improve build.properties comment in ant build files.
Backport from trunk, only the part on build.xml.
http://svn.apache.org/viewvc?rev=797425&view=rev
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=804512&r1=804511&r2=804512&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Aug 15
18:37:34 2009
@@ -74,6 +74,10 @@
41661: Fix thread safety issue in JspConfig.init() (markt)
+41824: Need to use canonical rather than binary form when
+writing code. (markt)
+
+
46907: Don't swallow input stream when debug logging is
enabled. (markt)
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java?rev=804512&r1=804511&r2=804512&view=diff
==
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/JspUtil.java
Sat Aug 15 18:37:34 2009
@@ -502,7 +502,7 @@
* or, if it's a primitive, the name of its correspondent boxed
* type.
*/
- String targetType = expectedType.getName();
+ String targetType = getCanonicalName(expectedType);
String primitiveConverterMethod = null;
if (expectedType.isPrimitive()) {
if (expectedType.equals(Boolean.TYPE)) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 24739] Control of secure flag when establishing sessions through https using cookies
https://issues.apache.org/bugzilla/show_bug.cgi?id=24739 Mark Thomas changed: What|Removed |Added CC||colinwilsons...@bluecycle.c ||om --- Comment #2 from Mark Thomas 2009-08-15 19:28:06 BST --- *** Bug 28780 has been marked as a duplicate of this bug. *** -- 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 28780] Need non-secure JSESSIONID cookies
https://issues.apache.org/bugzilla/show_bug.cgi?id=28780 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas 2009-08-15 19:28:06 BST --- *** This bug has been marked as a duplicate of bug 24739 *** -- 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 29141] JNDI Datasource HOW-TO server.xml config example doesn't work
https://issues.apache.org/bugzilla/show_bug.cgi?id=29141 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-08-15 19:26:43 BST --- This wasn't fixed for 4.1.x but was fixed in 5.5.x onwards. 4.1.x is no longer supported, therefore marking as fixed. -- 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 33967] add a parameter to Context
https://issues.apache.org/bugzilla/show_bug.cgi?id=33967 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #4 from Mark Thomas 2009-08-15 19:22:17 BST --- This patch will not be applied to the Tomcat code base. -- 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 34616] Cookie authorization in Tomcat.
https://issues.apache.org/bugzilla/show_bug.cgi?id=34616 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2009-08-15 19:19:41 BST --- No patch and no indication there is going to be one. -- 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: r804507 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Sat Aug 15 18:16:45 2009 New Revision: 804507 URL: http://svn.apache.org/viewvc?rev=804507&view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=804507&r1=804506&r2=804507&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Aug 15 18:16:45 2009 @@ -71,11 +71,12 @@ * https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Update to NSIS 2.45 http://svn.apache.org/viewvc?rev=797596&view=rev - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: kkolinko: Now it also requires the following patch, but I hope that sourceforge.net will fix their error: http://svn.apache.org/viewvc?rev=797600&view=rev + markt: +1 to the additional change if still required * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 Need to use canonical rather than binary form when writing code - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804502 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Aug 15 18:04:52 2009 New Revision: 804502 URL: http://svn.apache.org/viewvc?rev=804502&view=rev Log: Few votes, remove an applied patch 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=804502&r1=804501&r2=804502&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 15 18:04:52 2009 @@ -175,19 +175,13 @@ * https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Update to NSIS 2.45 http://svn.apache.org/viewvc?rev=797596&view=rev - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: kkolinko: Now it also requires the following patch, but I hope that sourceforge.net will fix their error: http://svn.apache.org/viewvc?rev=797600&view=rev rjung: +1 for both as long as the problem lasts (SF-DL still seems to be broken). - -* Improve build.properties comment in ant build files. - Backport from trunk. - http://svn.apache.org/viewvc?rev=797425&view=rev - +1: rjung, kkolinko - -1: - kkolinko: Comments are documentation, and thus RTC. + markt: ditto * Port Active Directory improvements to JNDIREalm from trunk Patch testing successfully by willing volunteer on the users list @@ -293,7 +287,7 @@ This ensures that code that actually executes Class.forName(...,classloader) during this phase works properly. http://svn.apache.org/viewvc?rev=804057&view=rev - +1: fhanik + +1: fhanik, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804501 - in /tomcat/tc6.0.x/trunk: ./ build.xml dist.xml extras.xml
Author: markt Date: Sat Aug 15 18:03:46 2009 New Revision: 804501 URL: http://svn.apache.org/viewvc?rev=804501&view=rev Log: Port Rainer's comment improvement from trunk Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/dist.xml tomcat/tc6.0.x/trunk/extras.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 15 18:03:46 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797607 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797425,797607 Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=804501&r1=804500&r2=804501&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Sat Aug 15 18:03:46 2009 @@ -20,8 +20,15 @@ - - + + + + + + + + + Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=804501&r1=804500&r2=804501&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Sat Aug 15 18:03:46 2009 @@ -20,8 +20,15 @@ - - + + + + + + + + + Modified: tomcat/tc6.0.x/trunk/extras.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=804501&r1=804500&r2=804501&view=diff == --- tomcat/tc6.0.x/trunk/extras.xml (original) +++ tomcat/tc6.0.x/trunk/extras.xml Sat Aug 15 18:03:46 2009 @@ -20,8 +20,15 @@ - - + + + + + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 41824] Unable to use nested type in TLD
https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 --- Comment #3 from Mark Thomas 2009-08-15 18:59:57 BST --- This has been fixed in 6.0.x and will be included in 6.0.21 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: r804499 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/JspUtil.java webapps/docs/changelog.xml
Author: markt Date: Sat Aug 15 17:59:51 2009 New Revision: 804499 URL: http://svn.apache.org/viewvc?rev=804499&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 Need to use canonical rather than binary form when writing code 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/JspUtil.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 15 17:59:51 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,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,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,770876,776921,776924,776935,776945,777464,77 7466,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,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,797168,797607 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=804499&r1=804498&r2=804499&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 15 17:59:51 2009 @@ -182,12 +182,6 @@ http://svn.apache.org/viewvc?rev=797600&view=rev rjung: +1 for both as long as the problem lasts (SF-DL still seems to be broken). -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 - Need to use canonical rather than binary form when writing code - http://svn.apache.org/viewvc?rev=797607&view=rev - +1: markt, rjung, kkolinko - -1: - * Improve build.properties comment in ant build files. Backport from trunk. http://svn.apache.org/viewvc?rev=797425&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=804499&r1=804498&r2=804499&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Sat Aug 15 17:59:51 2009 @@ -508,7 +508,7 @@ * or, if it's a primitive, the name of its correspondent boxed * type. */ -String targetType = expectedType.getName(); +String targetType = getCanonicalName(expectedType); String primitiveConverterMethod =
svn commit: r804497 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Aug 15 17:49:54 2009 New Revision: 804497 URL: http://svn.apache.org/viewvc?rev=804497&view=rev Log: Withdraw old access log patch. Propose new one. 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=804497&r1=804496&r2=804497&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 15 17:49:54 2009 @@ -100,16 +100,6 @@ +1: mturk, kkolinko, markt -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 - Update AccessLogValve with all the recent threading improvements - http://people.apache.org/~markt/patches/2009-06-24-AccessLogValve-tc6.patch - +1: markt - -1: kkolinko: It cannot be applied without additional patches, -because this change breaks ExtendedAccessLogValve.DateElement and -TimeElement: Their "if (currentDate != date)" check is broken, -because now the Date instance is reused in the same thread, and is -different across threads. - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797 Reverts previous fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an @@ -312,4 +302,9 @@ +1: fhanik -1: - +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 + Update AccessLogValve and ExtendedAccessLogValve with all the recent threading + improvements + http://people.apache.org/~markt/patches/2009-08-15-AccessLogValve-tc6.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804495 - /tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Author: markt
Date: Sat Aug 15 17:40:40 2009
New Revision: 804495
URL: http://svn.apache.org/viewvc?rev=804495&view=rev
Log:
Replace syncs with threadlocals.
Improve the logic that determines when to generate a new format string
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=804495&r1=804494&r2=804495&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Sat Aug 15 17:40:40 2009
@@ -222,61 +222,55 @@
// -- Lifecycle Methods
-protected class DateElement implements AccessLogElement {
-private Date currentDate = new Date(0);
-
-private String currentDateString = null;
-
-/**
- * A date formatter to format a Date into a date in the format
- * "-MM-dd".
- */
-private SimpleDateFormat dateFormatter = new
SimpleDateFormat("-MM-dd");
-
-public DateElement() {
-dateFormatter.setTimeZone(TimeZone.getTimeZone("GMT"));
-}
-
+protected static class DateElement implements AccessLogElement {
+// Milli-seconds in 24 hours
+private static final long INTERVAL = (1000 * 60 * 60 * 24);
+
+private static final ThreadLocal currentDate =
+new ThreadLocal() {
+protected ElementTimestampStruct initialValue() {
+return new ElementTimestampStruct("-MM-dd");
+}
+};
+
public void addElement(StringBuffer buf, Date date, Request request,
Response response, long time) {
-if (currentDate != date) {
-synchronized (this) {
-if (currentDate != date) {
-currentDateString = dateFormatter.format(date);
-currentDate = date;
-}
-}
+ElementTimestampStruct eds = currentDate.get();
+long millis = eds.currentTimestamp.getTime();
+if (date.getTime() > (millis + INTERVAL -1) ||
+date.getTime() < millis) {
+eds.currentTimestamp.setTime(
+date.getTime() - (date.getTime() % INTERVAL));
+eds.currentTimestampString =
+eds.currentTimestampFormat.format(eds.currentTimestamp);
}
-buf.append(currentDateString);
+buf.append(eds.currentTimestampString);
}
}
-protected class TimeElement implements AccessLogElement {
-private Date currentDate = new Date(0);
-
-private String currentTimeString = null;
-
-/**
- * A date formatter to format a Date into a time in the format
- * "kk:mm:ss" (kk is a 24-hour representation of the hour).
- */
-private SimpleDateFormat timeFormatter = new
SimpleDateFormat("HH:mm:ss");
-
-public TimeElement() {
-timeFormatter.setTimeZone(TimeZone.getTimeZone("GMT"));
-}
+protected static class TimeElement implements AccessLogElement {
+// Milli-seconds in a second
+private static final long INTERVAL = 1000;
+private static final ThreadLocal currentTime =
+new ThreadLocal() {
+protected ElementTimestampStruct initialValue() {
+return new ElementTimestampStruct("HH:mm:ss");
+}
+};
+
public void addElement(StringBuffer buf, Date date, Request request,
Response response, long time) {
-if (currentDate != date) {
-synchronized (this) {
-if (currentDate != date) {
-currentTimeString = timeFormatter.format(date);
-currentDate = date;
-}
-}
+ElementTimestampStruct eds = currentTime.get();
+long millis = eds.currentTimestamp.getTime();
+if (date.getTime() > (millis + INTERVAL -1) ||
+date.getTime() < millis) {
+eds.currentTimestamp.setTime(
+date.getTime() - (date.getTime() % INTERVAL));
+eds.currentTimestampString =
+eds.currentTimestampFormat.format(eds.currentTimestamp);
}
-buf.append(currentTimeString);
+buf.append(eds.currentTimestampString);
}
}
@@ -845,5 +839,15 @@
svn commit: r804463 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Sat Aug 15 12:10:45 2009 New Revision: 804463 URL: http://svn.apache.org/viewvc?rev=804463&view=rev Log: Withdraw old patch. Vote for new one. Include svn ref and additional testing info 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=804463&r1=804462&r2=804463&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Aug 15 12:10:45 2009 @@ -38,26 +38,6 @@ 0: remm (looks risky, very minor problem), fhanik - minor problem -1: -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 - See commit message for details of negligable performance impact - http://svn.apache.org/viewvc?rev=701358&view=rev - +1: markt, funkman - -0: remm (I also do not think the patch is a good idea as a backport) - -0: fhanik - the bug talks about WEB-INF/lib and reload, that would be when reload="true" which should be considered development only - So to make this bug actually worth while fixing, and not impact performance, then it should only do this check on files that - are relevant to the reload of an application, in other words a watched resource - -1: kkolinko: ( - FileDirContext#file() contains a check that file.canRead() is true. - A side-effect of this patch will be that files that are not readable - will be excluded from the enumeration provided by FileDirContext#list() - or FileDirContext#listBindings(). - I think that it is wrong. If file is not readable it should result in error 404 - or something like that. - - Thus, we have to revert this change in trunk. - I am proposing an alternative patch for bug 45403 below. - ) - * Backport cleanup of semantics of thisAccessedTime and lastAccessedTime for sessions: - preparational whitespace changes @@ -319,11 +299,10 @@ Add a check when enumerating jar files, and do not suppress IO errors when starting a web application. Note: -- I cannot test bug 45403 on Windows, as it is Un*x-specific -- tested in normal operation, with unpackWARs = "true" and "false" -- this has not yet been applied to trunk - http://people.apache.org/~kkolinko/patches/2009-08-13_bug45403-tc6.patch - +1: kkolinko +- tested in normal operation on windows, with unpackWARs="true" and "false" +- test on linux in normal and failure modes + http://svn.apache.org/viewvc?rev=804462&view=rev + +1: kkolinko, markt -1: * Perform deserialization with the context class loader set. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r804462 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappLoader.java
Author: markt
Date: Sat Aug 15 12:07:42 2009
New Revision: 804462
URL: http://svn.apache.org/viewvc?rev=804462&view=rev
Log:
Apply Konstantin's new patch for
https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=804462&r1=804461&r2=804462&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Sat
Aug 15 12:07:42 2009
@@ -49,3 +49,5 @@
webappLoader.starting=Starting this Loader
webappLoader.stopping=Stopping this Loader
webappLoader.failModifiedCheck=Error tracking modifications
+webappLoader.copyFailure=Failed to copy resources
+webappLoader.namingFailure=Failed to access resource {0}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=804462&r1=804461&r2=804462&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sat Aug 15
12:07:42 2009
@@ -40,7 +40,6 @@
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.naming.Binding;
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -870,8 +869,9 @@
/**
* Configure the repositories for our class loader, based on the
* associated Context.
+ * @throws IOException
*/
-private void setRepositories() {
+private void setRepositories() throws IOException {
if (!(container instanceof Context))
return;
@@ -925,7 +925,10 @@
classRepository = new File(workDir, classesPath);
classRepository.mkdirs();
-copyDir(classes, classRepository);
+if (!copyDir(classes, classRepository)) {
+throw new IOException(
+sm.getString("webappLoader.copyFailure"));
+}
}
@@ -973,59 +976,69 @@
}
// Looking up directory /WEB-INF/lib in the context
+NamingEnumeration enumeration = null;
try {
-NamingEnumeration enumeration =
-resources.listBindings(libPath);
-while (enumeration.hasMoreElements()) {
-
-Binding binding = enumeration.nextElement();
-String filename = libPath + "/" + binding.getName();
-if (!filename.endsWith(".jar"))
-continue;
-
-// Copy JAR in the work directory, always (the JAR file
-// would get locked otherwise, which would make it
-// impossible to update it or remove it at runtime)
-File destFile = new File(destDir, binding.getName());
-
-if( log.isDebugEnabled())
-log.debug(sm.getString("webappLoader.jarDeploy", filename,
- destFile.getAbsolutePath()));
+enumeration = libDir.list("");
+} catch (NamingException e) {
+IOException ioe = new IOException(sm.getString(
+"webappLoader.namingFailure", libPath));
+ioe.initCause(e);
+throw ioe;
+}
+while (enumeration.hasMoreElements()) {
+NameClassPair ncPair = enumeration.nextElement();
+String filename = libPath + "/" + ncPair.getName();
+if (!filename.endsWith(".jar"))
+continue;
-Object obj = binding.getObject();
-
-if (!(obj instanceof Resource))
-continue;
+// Copy JAR in the work directory, always (the JAR file
+// would get locked otherwise, which would make it
+// impossible to update it or remove it at runtime)
+File destFile = new File(destDir, ncPair.getName());
+
+if( log.isDebugEnabled())
+log.debug(sm.getString("webappLoader.jarDeploy", filename,
+ destFile.getAbsolutePath()));
+
+// Bug 45403 - Explicitly call lookup() on the name to check
+// that the resource is readable. We c
DO NOT REPLY [Bug 45403] Tomcat does not reload application
https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 --- Comment #5 from Mark Thomas 2009-08-15 13:06:47 BST --- The proposed patch failed to obtain the required votes. A new patch has been applied to trunk and proposed. -- 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: r804461 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Author: markt
Date: Sat Aug 15 12:06:24 2009
New Revision: 804461
URL: http://svn.apache.org/viewvc?rev=804461&view=rev
Log:
Revert r701358 for https://issues.apache.org/bugzilla/show_bug.cgi?id=45403
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=804461&r1=804460&r2=804461&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Sat Aug
15 12:06:24 2009
@@ -773,15 +773,6 @@
protected File file(String name) {
File file = new File(base, name);
-return validate(file);
-
-}
-
-
-/*
- * Check that the file is valid for this context
- */
-private File validate(File file) {
if (file.exists() && file.canRead()) {
if (allowLinking)
@@ -854,9 +845,7 @@
for (int i = 0; i < names.length; i++) {
-File currentFile = validate(new File(file, names[i]));
-if (currentFile == null) continue;
-
+File currentFile = new File(file, names[i]);
Object object = null;
if (currentFile.isDirectory()) {
FileDirContext tempContext = new FileDirContext(env);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r803794 - /tomcat/tc6.0.x/trunk/STATUS.txt
kkoli...@apache.org wrote: > + -1: kkolinko: ( > + FileDirContext#file() contains a check that file.canRead() is true. > + A side-effect of this patch will be that files that are not readable > + will be excluded from the enumeration provided by FileDirContext#list() > + or FileDirContext#listBindings(). > + I think that it is wrong. If file is not readable it should result in > error 404 > + or something like that. I think that point is debatable but... > +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 > + Add a check when enumerating jar files, and > + do not suppress IO errors when starting a web application. > + Note: > +- I cannot test bug 45403 on Windows, as it is Un*x-specific I assume you mean that you haven't been able to test this on *nix. If not, ignore most of what I have written below :) There are a couple of options here. As an Apache committer, you can apply for a full MSDN license. This should come up again shortly as the current licenses expire in November. You could then use MS's virtual server. I use VMWare Workstation (which you have to pay for) but VMWare server is available for free and should do what you need to do to test stuff on *nix. > +- tested in normal operation, with unpackWARs = "true" and "false" > +- this has not yet been applied to trunk It works for me on linux so I will revert my patch in trunk and apply your alternative. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
