svn commit: r832351 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

2009-11-03 Thread kkolinko
Author: kkolinko
Date: Tue Nov  3 09:05:12 2009
New Revision: 832351

URL: http://svn.apache.org/viewvc?rev=832351&view=rev
Log:
Apply Peter's patch
Close resource Stream in WebappClassLoader after read error

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:05:12 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,77
 
6945,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,776921,776924,77
 
6935,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832351&r1=832350&r2=832351&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 09:05:12 2009
@@ -67,11 +67,6 @@
   -1: remm: no for TC 6.0
   -1: funkman : api change in Session.java for .x.x release
 
-* Fix Close Stream at WebappClassLoader after read error
-  http://svn.apache.org/viewvc?rev=772872&view=rev 
-  +1: pero, funkman, kkolinko
-  -1:
-
 * When throwing Non-serializable exception, mark which argument was
   non-serializable to help tracing the cause when developing.
   http://svn.apache.org/viewvc?rev=713953&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/

svn commit: r832354 - /tomcat/tc5.5.x/trunk/STATUS.txt

2009-11-03 Thread kkolinko
Author: kkolinko
Date: Tue Nov  3 09:07:59 2009
New Revision: 832354

URL: http://svn.apache.org/viewvc?rev=832354&view=rev
Log:
backport proposal

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=832354&r1=832353&r2=832354&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Nov  3 09:07:59 2009
@@ -177,3 +177,7 @@
   +1: rjung
   -1:
 
+* Fix Close Stream at WebappClassLoader after read error
+  http://svn.apache.org/viewvc?rev=832351&view=rev
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r832365 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/session/ webapps/docs/

2009-11-03 Thread kkolinko
Author: kkolinko
Date: Tue Nov  3 09:47:38 2009
New Revision: 832365

URL: http://svn.apache.org/viewvc?rev=832365&view=rev
Log:
Apply Mladen's patch
When throwing Non-serializable exception, mark which argument was 
non-serializable to help tracing the cause when developing.

Note, that "setAttribute1.iae.patch" file is not available, so the change is 
based on the trunk rev.713953,714002 + current LocalStrings_fr.properties of 
trunk.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 09:47:38 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,776921,776924,77
 
6935,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832365&r1=832364&r2=832365&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 09:47:38 2009
@@ -67,15 +67,6 @@
   -1: remm: no for TC 6.0
   -1: funkman : api change in Session.java for .x.x release
 
-* When throwing Non-serializable exception, mark whic

svn commit: r832373 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

2009-11-03 Thread kkolinko
Author: kkolinko
Date: Tue Nov  3 10:17:41 2009
New Revision: 832373

URL: http://svn.apache.org/viewvc?rev=832373&view=rev
Log:
Apply the first patch for bug 48097
Make WebappClassLoader to do not swallow AccessControlException

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 10:17:41 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831828,831850,831860

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832373&r1=832372&r2=832373&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 10:17:41 2009
@@ -238,13 +238,7 @@
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
-  There are two patches to be applied:
-  1) Make WebappClassLoader to do not swallow AccessControlException
-  http://svn.apache.org/viewvc?rev=831828&view=rev
-  +1: kkolinko, rjung, billbarker
-  -1:
-
-  2) Patch for SecurityClassLoad to preload o.a.c.loader.ResourceEntry class
+  Patch for SecurityClassLoad to preload o.a.c.loader.ResourceEntry class
   http://svn.apache.org/viewvc?rev=831830&view=rev
   +1: kkolinko
   -0: billbarker Exposing ResourceEntry is harmless enough, but 
WebappClassLoader sh

DO NOT REPLY [Bug 46950] SSL renegotiation does not occur when resource with CLIENT-CERT auth is requested

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46950

--- Comment #12 from Andre Cruz  2009-11-03 02:54:46 UTC ---
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



Re: svn commit: r832256 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2009-11-03 Thread sebb
On 03/11/2009, jfcl...@apache.org  wrote:
> Author: jfclere
>  Date: Tue Nov  3 01:45:05 2009
>  New Revision: 832256
>
>  URL: http://svn.apache.org/viewvc?rev=832256&view=rev
>  Log:
>  Oops... The date for my PC is already 3...
>
>  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=832256&r1=832255&r2=832256&view=diff
>  
> ==
>  --- tomcat/site/trunk/docs/index.html (original)
>  +++ tomcat/site/trunk/docs/index.html Tue Nov  3 01:45:05 2009
>  @@ -273,7 +273,7 @@
>   http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat 
> meetup
>   is organised
>   
>  -On Monday 3th of November at 20:00  href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
>  for it
>  +On Monday 2d of November at 20:00  href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
>  for it

s/2d/2nd/

>   and join us in Oakland at the  href="http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.
>   
>   
>
>  Modified: tomcat/site/trunk/xdocs/index.xml
>  URL: 
> http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=832256&r1=832255&r2=832256&view=diff
>  
> ==
>  --- tomcat/site/trunk/xdocs/index.xml (original)
>  +++ tomcat/site/trunk/xdocs/index.xml Tue Nov  3 01:45:05 2009
>  @@ -46,7 +46,7 @@
>   http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat 
> meetup
>   is organised
>   
>  -On Monday 3th of November at 20:00  href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
>  for it
>  +On Monday 2d of November at 20:00  href="http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
>  for it

s/2d/2nd/

>   and join us in Oakland at the  href="http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.
>   
>   
>
>
>
>  -
>  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: r832431 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2009-11-03 Thread kkolinko
Author: kkolinko
Date: Tue Nov  3 14:35:31 2009
New Revision: 832431

URL: http://svn.apache.org/viewvc?rev=832431&view=rev
Log:
corrections

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=832431&r1=832430&r2=832431&view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Tue Nov  3 14:35:31 2009
@@ -273,7 +273,7 @@
 http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat 
meetup
 is organised
 
-On Monday 2d of November at 20:00 http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
 for it
+On Monday 2nd of November at 20:00 http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
 for it
 and join us in Oakland at the http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.
 
 
@@ -290,8 +290,8 @@
 
 
 
-
-old news
+
+Old news
 
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=832431&r1=832430&r2=832431&view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Tue Nov  3 14:35:31 2009
@@ -46,12 +46,12 @@
 http://wiki.apache.org/tomcat/TomcatAtApacheConUs2009";>Tomcat 
meetup
 is organised
 
-On Monday 2d of November at 20:00 http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
 for it
+On Monday 2nd of November at 20:00 http://spreadsheets.google.com/viewform?formkey=dEJLcHk3c1ZrRm8tWUNYeXZZckN0Vnc6MA";>register
 for it
 and join us in Oakland at the http://www.us.apachecon.com/c/acus2009/";>ApacheCon location.
 
 
 
-
+
 
   See  former announcements
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 48112] New: Closing curly brace in literal string incorrectly treated as expression terminator.

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48112

   Summary: Closing curly brace in literal string incorrectly
treated as expression terminator.
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Mac OS X 10.4
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: schnake.mich...@t-online.de


On tomcat 6.0.20 something like the following line in a JSP causes a exception:



After removing the closing curly brace from the literal ('{world}' -> '{world')
the JSP works. This behaviour seems specific to 6.0.20, as on 6.0.18 and 6.0.16
the line above works fine.

Example of exception:
=
org.apache.jasper.JasperException: An exception occurred processing JSP page
/test.jsp at line 11

8: 
9: 
10: 
11: 
12: 
13: 


Stacktrace:
   
org.apache.jasper.servlet.JspServletWrapper.handleJspException(JspServletWrapper.java:505)
   
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:416)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
root cause

javax.el.ELException: Error Parsing: ${fn:trim('{world}
   
org.apache.el.lang.ExpressionBuilder.createNodeInternal(ExpressionBuilder.java:125)
org.apache.el.lang.ExpressionBuilder.build(ExpressionBuilder.java:150)
   
org.apache.el.lang.ExpressionBuilder.createValueExpression(ExpressionBuilder.java:194)
   
org.apache.el.ExpressionFactoryImpl.createValueExpression(ExpressionFactoryImpl.java:68)
   
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:934)
org.apache.jsp.test_jsp._jspx_meth_c_005fout_005f0(test_jsp.java:98)
org.apache.jsp.test_jsp._jspService(test_jsp.java:72)
org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
   
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
root cause

org.apache.el.parser.ParseException: Encountered "  "\' ""
at line 1, column 11.
Was expecting one of:
 ...
 ...
 ...
"true" ...
"false" ...
"null" ...
"(" ...
")" ...
"!" ...
"not" ...
"empty" ...
"-" ...
 ...

org.apache.el.parser.ELParser.generateParseException(ELParser.java:2142)
org.apache.el.parser.ELParser.jj_consume_token(ELParser.java:2024)
org.apache.el.parser.ELParser.Function(ELParser.java:1207)
org.apache.el.parser.ELParser.NonLiteral(ELParser.java:1114)
org.apache.el.parser.ELParser.ValuePrefix(ELParser.java:1016)
org.apache.el.parser.ELParser.Value(ELParser.java:965)
org.apache.el.parser.ELParser.Unary(ELParser.java:947)
org.apache.el.parser.ELParser.Multiplication(ELParser.java:711)
org.apache.el.parser.ELParser.Math(ELParser.java:631)
org.apache.el.parser.ELParser.Compare(ELParser.java:443)
org.apache.el.parser.ELParser.Equality(ELParser.java:337)
org.apache.el.parser.ELParser.And(ELParser.java:281)
org.apache.el.parser.ELParser.Or(ELParser.java:225)
org.apache.el.parser.ELParser.Choice(ELParser.java:182)
org.apache.el.parser.ELParser.Expression(ELParser.java:174)
org.apache.el.parser.ELParser.DynamicExpression(ELParser.java:146)
org.apache.el.parser.ELParser.CompositeExpression(ELParser.java:43)
   
org.apache.el.lang.ExpressionBuilder.createNodeInternal(ExpressionBuilder.java:93)
org.apache.el.lang.ExpressionBuilder.build(ExpressionBuilder.java:150)
   
org.apache.el.lang.ExpressionBuilder.createValueExpression(ExpressionBuilder.java:194)
   
org.apache.el.ExpressionFactoryImpl.createValueExpression(ExpressionFactoryImpl.java:68)
   
org.apache.jasper.runtime.PageContextImpl.proprietaryEvaluate(PageContextImpl.java:934)
org.apache.jsp.test_jsp._jspx_meth_c_005fout_005f0(test_jsp.java:98)
org.apache.jsp.test_jsp._jspService(test_jsp.java:72)
org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70)
javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
   
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:374)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:342)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:267)
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.

-

Re: svn commit: r832039 - in /tomcat/trunk/java/org/apache/naming: HandlerRef.java ResourceRef.java ServiceRef.java StringManager.java resources/DirContextURLStreamHandler.java

2009-11-03 Thread Filip Hanik - Dev Lists

On 11/02/2009 02:30 PM, Remy Maucherat wrote:

On Mon, 2009-11-02 at 18:46 +, ma...@apache.org wrote:
   

Author: markt
Date: Mon Nov  2 18:46:21 2009
New Revision: 832039

URL: http://svn.apache.org/viewvc?rev=832039&view=rev
Log:
StringBuffer ->  StringBuilder for o.a.naming
 

So I did not test or anything, but is SBuilder faster than SBuffer ? Or
it uses less resources ?
   


in most uses cases you'd barely see a difference. As speed locking has 
gotten much better. (my unqualified guess is that locking is optimistic) 
The only time you'd see a difference is if there was an actual 
contention on the resource, which with StringBuffers is rare too.

Rémy



-
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 48011] Parameters with contentType=multipart/form-data from request is null after FORM authentification checking

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48011

--- Comment #6 from Serg Mavrov  2009-11-03 08:33:42 UTC 
---
Hello.. Is there any update for this problem?

-- 
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 47330] proposal : port of mod_remoteip in Tomcat as RemoteIpValve

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47330

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #6 from Mark Thomas  2009-11-03 17:25:13 GMT ---
The updated patch is missing a bunch of files including the valve and the test
case.

-- 
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 47331] No translation error messag when using #{...} in template text

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47331

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2009-11-03 15:05:30 GMT ---
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: r832636 - in /tomcat/trunk/java/org/apache: catalina/ant/jmx/JMXAccessorTask.java catalina/tribes/transport/bio/BioReceiver.java catalina/valves/JDBCAccessLogValve.java tomcat/util/net/Nio

2009-11-03 Thread funkman
Author: funkman
Date: Wed Nov  4 00:54:02 2009
New Revision: 832636

URL: http://svn.apache.org/viewvc?rev=832636&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=46947

Code cleanup patch that removes some obsolete null checks



Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Wed Nov  
4 00:54:02 2009
@@ -430,10 +430,8 @@
 try {
 jmxServerConnection = (MBeanServerConnection) pref;
 } catch (ClassCastException cce) {
-if (project != null) {
-project.log("wrong object reference " + refId + " - "
+project.log("wrong object reference " + refId + " - "
 + pref.getClass());
-}
 return null;
 }
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java 
Wed Nov  4 00:54:02 2009
@@ -30,7 +30,7 @@
 /**
  *
  * @author Filip Hanik
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
  */
 public class BioReceiver extends ReceiverBase implements Runnable, 
ChannelReceiver, ListenCallback {
 

Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed 
Nov  4 00:54:02 2009
@@ -462,17 +462,13 @@
 
 getNext().invoke(request, response);
 
-String remoteHost = EMPTY;
+String remoteHost;
 if(resolveHosts)
 remoteHost = request.getRemoteHost();
 else
 remoteHost = request.getRemoteAddr();
-String user = EMPTY;
-if(request != null)
-user = request.getRemoteUser();
-String query="";
-if(request != null)
-query = request.getRequestURI();
+String user = request.getRemoteUser();
+String query=request.getRequestURI();
 
 long bytes = response.getContentCountLong() ;
 if(bytes < 0)
@@ -482,7 +478,7 @@
 String method = EMPTY;
 String referer = EMPTY;
 String userAgent = EMPTY;
-if (pattern.equals("combined") && request != null) {
+if (pattern.equals("combined")) {
 virtualHost = request.getServerName();
 method = request.getMethod();
 referer = request.getHeader("referer");

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Wed 
Nov  4 00:54:02 2009
@@ -350,7 +350,7 @@
 countDown(attachment.getWriteLatch());
 }
 }catch (CancelledKeyException ckx) {
-if (sk!=null) sk.cancel();
+sk.cancel();
 countDown(attachment.getReadLatch());
 countDown(attachment.getWriteLatch());
 }
@@ -391,4 +391,4 @@
 }
 }
 
-}
\ No newline at end of file
+}



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 46947] Code cleanup patch that removes some obsolete null checks

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46947

Tim Funk  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #1 from Tim Funk  2009-11-03 16:54:46 UTC ---
applied to trunk (tomcat7) - don't intend to cleanup tomcat6 (unless someone
has the itch to reopen)

commit revision 832636

-- 
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: svn commit: r832039 - in /tomcat/trunk/java/org/apache/naming: HandlerRef.java ResourceRef.java ServiceRef.java StringManager.java resources/DirContextURLStreamHandler.java

2009-11-03 Thread Mark Thomas
Filip Hanik - Dev Lists wrote:
> On 11/02/2009 02:30 PM, Remy Maucherat wrote:
>> On Mon, 2009-11-02 at 18:46 +, ma...@apache.org wrote:
>>   
>>> Author: markt
>>> Date: Mon Nov  2 18:46:21 2009
>>> New Revision: 832039
>>>
>>> URL: http://svn.apache.org/viewvc?rev=832039&view=rev
>>> Log:
>>> StringBuffer ->  StringBuilder for o.a.naming
>>>  
>> So I did not test or anything, but is SBuilder faster than SBuffer ? Or
>> it uses less resources ?
>>
> 
> in most uses cases you'd barely see a difference. As speed locking has
> gotten much better. (my unqualified guess is that locking is optimistic)
> The only time you'd see a difference is if there was an actual
> contention on the resource, which with StringBuffers is rare too.

I'm leaning towards not porting this to 6.0.x since there is no clear
performance issue caused by StringBuffer in 6.0.x. That said, the Javadoc for
StringBuilder is enough to convince me that we should make the change in trunk
as part of the general clean-up/improvement of the code for Tomcat 7.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 48113] New: Member hostname components are printed as signed 8bits

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48113

   Summary: Member hostname components are printed as signed 8bits
   Product: Tomcat 6
   Version: unspecified
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Cluster
AssignedTo: dev@tomcat.apache.org
ReportedBy: apache@add.za.net


Created an attachment (id=24467)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24467)
Patch to print hostname IP components as unsigned int

Hey,

Take the following member for example: 192.168.1.61:4000, when it's hostname is
printed (like in toString()), it shows as: 
tcp://{-64, -88, 1, 61}:4000

Like in:
16:23:17,773 INFO  [TcpFailureDetector] Received
memberDisappeared[org.apache.catalina.tribes.membership.MemberImpl[tcp://{-64,
-88, 1, 61}:4000,{-64, -88, 1, 61},4000, alive=1814258,id={50 18 86 10 111 -47
79 83 -108 -4 82 -8 26 82 -79 -59 }, payload={-84 -19 0 5 115 114 0 50 111
...(423)}, command={}, domain={74 79 84 84 65 95 87 65 68 ...(10)}, ]] message.
Will verify.
16:23:17,897 INFO  [TcpFailureDetector] Verification complete. Member still
alive[org.apache.catalina.tribes.membership.MemberImpl[tcp://{-64, -88, 1,
61}:4000,{-64, -88, 1, 61},4000, alive=1814258,id={50 18 86 10 111 -47 79 83
-108 -4 82 -8 26 82 -79 -59 }, payload={-84 -19 0 5 115 114 0 50 111 ...(423)},
command={}, domain={74 79 84 84 65 95 87 65 68 ...(10)}, ]]

I attached a patch which takes the Arrays.toString(byte[]) and creates another
one with a second argument "unsigned". Then the original delegates to this new
one with a default of "false" for unsigned. So existing code will continue to
behave as is, but the getHostname() code in MemberImpl passes "true" for this
argument, which will make the name print as:
tcp://{192, 168, 1, 61}:4000

So this code updates:
java/org/apache/catalina/tribes/util/Arrays.java
java/org/apache/catalina/tribes/membership/MemberImpl.java

I generated the patch from trunk with a root of:
java/org/apache/catalina/

So it needs to be applied from this directory.

-- 
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



UserConfig: alternative implementation

2009-11-03 Thread Mikhail Kryshen
Hi,

I have implemented host event listener similar to
org.apache.catalina.startup.UserConfig but with support for multiple
webapps per user, automatic deployment and remote user databases on UNIX.

Currently it is available as a separate package that could be added to
tomcat6 classpath and referenced in server.xml.

Description: http://kryshen.net/userconfig/
Code: http://kryshen.net/userconfig/userconfig-latest.tar.gz

Implementation details:
Abstract class UserConfig extend HostConfig to reuse automatic deployment
functionality. Two concrete implementations of UserConfig are provided:
PasswdUserConfig uses local passwd file or getent command to list users
and HomesUserConfig reads user home subdirectories in the specified base
directory.

I do not think it makes sense to have separate UserDatabase
interface like in current Tomcat implementation because of tight
coupling between the classes: UserDatabase requires UserConfig to access
configuration properties and UserConfig have to have all properties
needed by all UserDatabase implementations.

I could contribute this code as a patch, but need to resolve some issues:
- my implementation is not compatible with current UserConfig in Tomcat
(brake compatibility or name it differently and provide as an alternative
to the original UserConfig?);
- it may be better to separate HostConfig methods useful for UserConfig
in an abstract class to be extended by HostConfig and UserConfig;
- javadoc comments may need correction (I'm not native English).

--
Mikhail

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 39231] The JAAS contract for LoginModule is broken

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39231

--- Comment #8 from Mark Thomas  2009-11-03 16:09:06 GMT ---
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: r832638 - /tomcat/trunk/java/org/apache/naming/NamingContext.java

2009-11-03 Thread funkman
Author: funkman
Date: Wed Nov  4 01:18:08 2009
New Revision: 832638

URL: http://svn.apache.org/viewvc?rev=832638&view=rev
Log:
Binding java.lang.reflect.Proxy to JNDI directory raises 
java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512

Also acts as dead code removal


Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java

Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832638&r1=832637&r2=832638&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov  4 01:18:08 
2009
@@ -794,13 +794,8 @@
 }
 } else if (entry.type == NamingEntry.REFERENCE) {
 try {
-Object obj = NamingManager.getObjectInstance
+return NamingManager.getObjectInstance
 (entry.value, name, this, env);
-if (obj != null) {
-entry.value = obj;
-entry.type = NamingEntry.ENTRY;
-}
-return obj;
 } catch (NamingException e) {
 throw e;
 } catch (Exception e) {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r832639 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-11-03 Thread funkman
Author: funkman
Date: Wed Nov  4 01:20:33 2009
New Revision: 832639

URL: http://svn.apache.org/viewvc?rev=832639&view=rev
Log:
proposal for 47512


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=832639&r1=832638&r2=832639&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov  4 01:20:33 2009
@@ -383,3 +383,11 @@
   
http://people.apache.org/~kkolinko/patches/2009-11-03_StringBuilder_o_a_c_valves_AccessLogValve.patch
   +1: kkolinko
   -1:
+
+
+* Binding java.lang.reflect.Proxy to JNDI directory raises 
java.lang.ClassCastException
+  https://issues.apache.org/bugzilla/show_bug.cgi?id=47512
+  http://svn.apache.org/viewvc?rev=832638&view=rev
+  +1: funkman
+  -1:
+



-
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

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512

--- Comment #3 from Tim Funk  2009-11-03 17:21:20 UTC ---
in trunk as http://svn.apache.org/viewvc?rev=832638&view=rev

updated STATUS.txt for tomcat 6 inclusion

-- 
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 48116] New: Cannot use JAXP 1.4 XML APIs from JDK 1.6 without use of 'endorsed'

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48116

   Summary: Cannot use JAXP 1.4 XML APIs from JDK 1.6 without use
of 'endorsed'
   Product: Tomcat 6
   Version: 6.0.20
  Platform: PC
OS/Version: Mac OS X 10.4
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: bimargul...@gmail.com


Created an attachment (id=24469)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24469)
maven project to build the testcase.

In the about-to-be-attached test case, the code uses the new JAXP 1.4 APIs that
are intended to avoid the need for the 'endorsed' mechanism. One can call
(e.g.)
XPathFactory.newInstance("the name of a class", aClassloader) to as for a
specific implementation.

All this works fine standalone, and (as it happens) in Jety.

In tomcat 6.0.20, this leads to the following stacktrace. Note in the
stacktrace that one piece of Apache Xpath code is looking for a nonexistent
function of another piece and not finding it. 

root cause

java.lang.NoSuchMethodError: org.apache.xpath.XPathContext.(Z)V
org.apache.xpath.jaxp.XPathImpl.eval(XPathImpl.java:207)
org.apache.xpath.jaxp.XPathImpl.evaluate(XPathImpl.java:281)
org.apache.mtomcatbug.Serviette.doGet(Serviette.java:58)
javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
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 48116] Cannot use JAXP 1.4 XML APIs from JDK 1.6 without use of 'endorsed'

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48116

--- Comment #1 from bmargulies  2009-11-03 17:03:26 UTC 
---
Note that this test case and entire bug depends on running with JDK 1.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



svn commit: r832589 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-11-03 Thread funkman
Author: funkman
Date: Tue Nov  3 22:50:50 2009
New Revision: 832589

URL: http://svn.apache.org/viewvc?rev=832589&view=rev
Log:
votes

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=832589&r1=832588&r2=832589&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 22:50:50 2009
@@ -72,7 +72,7 @@
   It is updated version of Mark's (since withdrawn) patch,
   where the new method in JAASRealm calls the old one.
   http://people.apache.org/~kkolinko/patches/2009-11-02_bug39231.patch
-  +1: kkolinko, markt
+  +1: kkolinko, markt,funkman
   -1: 
  
 * Improve NIO connector shutdown time by doing shutdowns in parallel
@@ -153,7 +153,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
   Better handling of PID files
   https://issues.apache.org/bugzilla/attachment.cgi?id=24202
-  +1: markt
+  +1: markt, funkman
   +1: fhanik (although, on .sh, I think we could get rid of 'Bootstrap stop' 
by now, shutdown hooks have been available for quite some time)
   -1: 

@@ -162,7 +162,7 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   Threading issue in classloading. Adds a sync so please check performance
   http://svn.apache.org/viewvc?rev=805182&view=rev 
-  +1: markt
+  +1: markt, funkman
0: jim
   -1: fhanik, I would say a thread safe, yet concurrent implementation would do
   synchronized (className.intern()) {
@@ -206,7 +206,7 @@
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47267
   http://svn.apache.org/viewvc?rev=817822&view=rev
-  +1: markt
+  +1: markt, funkman
   -1:
   rjung: Our dreaded multi platform build system is a bit fragile
   w.r.t. fixcrlf. If you change the file to crlf in the installer
@@ -228,7 +228,7 @@
 
 * Fix ReplicationValve CrossContext support
   http://svn.apache.org/viewvc?rev=831718&view=rev
-  +1: pero, rjung
+  +1: pero, rjung, funkman
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47331
@@ -410,5 +410,5 @@
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47918
   Correct copy and paste in mbeans descriptions
   http://svn.apache.org/viewvc?rev=832218&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, funkman
   -1: 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 48080] Tomcat documentation and JDBC context

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48080

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||DUPLICATE

--- Comment #1 from Mark Thomas  2009-11-03 16:27:46 GMT ---
*** This bug has been marked as a duplicate of bug 47235 ***

-- 
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: r832592 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/jasper/compiler/Validator.java java/org/apache/jasper/resources/LocalStrings.properties webapps/docs/changelog.xml

2009-11-03 Thread markt
Author: markt
Date: Tue Nov  3 23:06:47 2009
New Revision: 832592

URL: http://svn.apache.org/viewvc?rev=832592&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47331
Treat uninterpreted tags as template text for JSP.2.2
 

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/Validator.java

tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 23:06:47 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831828,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831785,831828,831850,831860

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832592&r1=832591&r2=832592&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 23:06:47 2009
@@ -231,12 +231,6 @@
   +1: pero, rjung, funkman
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47331
-  Treat uninterpretted tags as template text for JSP.2.2
-  http://svn.apache.org/viewvc?rev=831785&view=rev
-  +1: markt, rjung, kkolinko
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48097
   Patch for SecurityClassLoad to preload o.a.c.loader.ResourceEntry class
   http://svn.apache.org/viewvc?rev=831830&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/a

svn commit: r832626 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/realm/ java/org/apache/catalina/session/ webapps/docs/

2009-11-03 Thread markt
Author: markt
Date: Wed Nov  4 00:08:46 2009
New Revision: 832626

URL: http://svn.apache.org/viewvc?rev=832626&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
JAAS LoginContext expects a call to logout()

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardSession.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=832626&r1=832625&r2=832626&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov  4 00:08:46 2009
@@ -67,14 +67,6 @@
   -1: remm: no for TC 6.0
   -1: funkman : api change in Session.java for .x.x release
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231
-  JAAS LoginContext expects a call to logout()
-  It is updated version of Mark's (since withdrawn) patch,
-  where the new method in JAASRealm calls the old one.
-  http://people.apache.org/~kkolinko/patches/2009-11-02_bug39231.patch
-  +1: kkolinko, markt,funkman
-  -1: 
- 
 * Improve NIO connector shutdown time by doing shutdowns in parallel
   and with a timeout
   http://svn.apache.org/viewvc?view=rev&revision=791914

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=832626&r1=832625&r2=832626&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/GenericPrincipal.java 
Wed Nov  4 00:08:46 2009
@@ -22,6 +22,10 @@
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.List;
+
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+
 import org.apache.catalina.Realm;
 
 
@@ -83,7 +87,26 @@
  */
 public GenericPrincipal(Realm realm, String name, String password,
 List roles, Principal userPrincipal) {
-
+this(realm, name, password, roles, userPrincipal, null);
+}
+
+/**
+ * Construct a new Principal, associated with the specified Realm, for the
+ * specified username and password, with the specified role names
+ * (as Strings).
+ *
+ * @param realm The Realm that owns this principal
+ * @param name The username of the user represented by this Principal
+ * @param password Credentials used to authenticate this user
+ * @param roles List of roles (must be Strings) possessed by this user
+ * @param userPrincipal - the principal to be returned from the request 
+ *getUserPrincipal call if not null; if null, this will be returned
+ * @param loginContext  - If provided, this will be used to log out the 
user
+ *at the appropriate time
+ */
+public GenericPrincipal(Realm realm, String name, String password,
+List roles, Principal userPrincipal,
+LoginContext loginContext) {
 super();
 this.realm = realm;
 this.name = name;
@@ -95,6 +118,7 @@
 if (this.roles.length > 0)
 Arrays.sort(this.roles);
 }
+this.loginContext = loginContext;
 }
 
 
@@ -159,6 +183,16 @@
 }
 }
 
+
+/**
+ * The JAAS LoginContext, if any, used to authenticate this Principal.
+ * Kept so we can call logout().
+ */
+protected LoginContext loginContext = null;
+
+void setLoginContext( LoginContext loginContext ) {
+this.loginContext=loginContext;
+}
 
 // - Public Methods
 
@@ -196,5 +230,22 @@
 
 }
 
+
+/**
+ * Calls logout, if necessary, on any associated JAASLoginContext. May in
+ * the future be extended to cover other logout requirements.
+ * 
+ * @throws Exception If something goes wrong with the logout. Uses 
Exception
+ *   to allow for future expansion of this method to cover
+ *   other logout mechanisms that might throw a different
+ *   exception to LoginContext
+ * 
+ */
+public void logout() throws Exception {
+if (loginContext != null) {
+loginContext.logout();
+}
+}
+
 
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/c

DO NOT REPLY [Bug 43154] forward port from 5.5.x to 6.x about AccessLogValve

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=43154

Tim Funk  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Tim Funk  2009-11-03 16:26:13 UTC ---
this appears to be applied back in sept 2007 - 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



svn commit: r832632 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.sh webapps/docs/changelog.xml

2009-11-03 Thread markt
Author: markt
Date: Wed Nov  4 00:24:43 2009
New Revision: 832632

URL: http://svn.apache.org/viewvc?rev=832632&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
Better handling of PID files

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/bin/catalina.sh
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=832632&r1=832631&r2=832632&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov  4 00:24:43 2009
@@ -142,15 +142,6 @@
   +1: markt
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
-  Better handling of PID files
-  https://issues.apache.org/bugzilla/attachment.cgi?id=24202
-  +1: markt, funkman
-  +1: fhanik (although, on .sh, I think we could get rid of 'Bootstrap stop' 
by now, shutdown hooks have been available for quite some time)
-  -1: 
-   
-  
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
   Threading issue in classloading. Adds a sync so please check performance
   http://svn.apache.org/viewvc?rev=805182&view=rev 

Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=832632&r1=832631&r2=832632&view=diff
==
--- tomcat/tc6.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina.sh Wed Nov  4 00:24:43 2009
@@ -291,6 +291,13 @@
 
 elif [ "$1" = "start" ] ; then
 
+  if [ ! -z "$CATALINA_PID" ]; then
+if [ -f "$CATALINA_PID" ]; then
+  echo "PID file ($CATALINA_PID) found. Is Tomcat still running? Start 
aborted."
+  exit 1
+fi
+  fi
+
   shift
   touch "$CATALINA_BASE"/logs/catalina.out
   if [ "$1" = "-security" ] ; then
@@ -308,9 +315,6 @@
   org.apache.catalina.startup.Bootstrap "$@" start \
   >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
 
-  if [ ! -z "$CATALINA_PID" ]; then
-echo $! > $CATALINA_PID
-  fi
   else
 "$_RUNJAVA" "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
   -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
@@ -320,20 +324,44 @@
   org.apache.catalina.startup.Bootstrap "$@" start \
   >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
 
-  if [ ! -z "$CATALINA_PID" ]; then
-echo $! > $CATALINA_PID
-  fi
+  fi
+
+  if [ ! -z "$CATALINA_PID" ]; then
+echo $! > $CATALINA_PID
   fi
 
 elif [ "$1" = "stop" ] ; then
 
   shift
+
+  SLEEP=5
+  if [ ! -z "$1" ]; then
+echo $1 | grep "[^0-9]" > /dev/null 2>&1
+if [ $? -eq 1 ]; then
+  SLEEP=$1
+  shift
+fi
+  fi
+
   FORCE=0
   if [ "$1" = "-force" ]; then
 shift
 FORCE=1
   fi
 
+  if [ ! -z "$CATALINA_PID" ]; then
+if [ -f "$CATALINA_PID" ]; then
+  kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
+  if [ $? -eq 1 ]; then
+echo "PID file ($CATALINA_PID) found but no matching process was 
found. Stop aborted."
+exit 1
+  fi
+else
+  echo "\$CATALINA_PID was set ($CATALINA_PID) but the specified file does 
not exist. Is Tomcat running? Stop aborted."
+  exit 1
+fi
+  fi
+  
   "$_RUNJAVA" $JAVA_OPTS \
 -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
 -Dcatalina.base="$CATALINA_BASE" \
@@ -341,12 +369,36 @@
 -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 org.apache.catalina.startup.Bootstrap "$@" stop
 
+  if [ ! -z "$CATALINA_PID" ]; then
+if [ -f "$CATALINA_PID" ]; then
+  while [ $SLEEP -ge 0 ]; do 
+kill -0 `cat $CATALINA_PID` >/dev/null 2>&1
+if [ $? -eq 1 ]; then
+  rm $CATALINA_PID
+  break
+fi
+if [ $SLEEP -gt 0 ]; then
+  sleep 1
+fi
+if [ $SLEEP -eq 0 ]; then
+  if [ $FORCE -eq 0 ]; then
+echo "Tomcat did not stop in time. PID file was not removed."
+  fi
+fi
+SLEEP=`expr $SLEEP - 1 `
+  done
+fi
+  fi
+
   if [ $FORCE -eq 1 ]; then
-if [ ! -z "$CATALINA_PID" ]; then
-   echo "Killing: `cat $CATALINA_PID`"
-   kill -9 `cat $CATALINA_PID`
+if [ -z "$CATALINA_PID" ]; then
+  echo "Kill failed: \$CATALINA_PID not set"
 else
-   echo "Kill failed: \$CATALINA_PID not set"
+  if [ -f "$CATALINA_PID" ]; then
+echo "Killing: `cat $CATALINA_PID`"
+kill -9 `cat $CATALINA_PID`
+rm $CATALINA_PID
+  fi
 fi
   fi
 
@@ -372,9 +424,12 @@
   echo "  run -security Start in the current window with security manager"
   echo "  start Start Catalina in a separate window"
   echo "  start -security   Start in a separate window with security manager"
-  echo "  stop  Stop Catalina"
-  echo "  stop -force   Stop Catalina (followed by kill -KILL)"
+  echo 

svn commit: r832597 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/startup/mbeans-descriptors.xml webapps/docs/changelog.xml

2009-11-03 Thread markt
Author: markt
Date: Tue Nov  3 23:23:34 2009
New Revision: 832597

URL: http://svn.apache.org/viewvc?rev=832597&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47918
Correct copy and paste in mbeans descriptions

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  3 23:23:34 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831785,831828,831850,831860
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,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,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,772872,77
 
6921,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,815972,817442,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,831774,831785,831828,831850,831860,832218

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832597&r1=832596&r2=832597&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov  3 23:23:34 2009
@@ -400,9 +400,3 @@
   
http://people.apache.org/~kkolinko/patches/2009-11-03_StringBuilder_o_a_c_valves_AccessLogValve.patch
   +1: kkolinko
   -1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47918
-  Correct copy and paste in mbeans descriptions
-  http://svn.apache.org/viewvc?rev=832218&view=rev
-  +1: markt, kkolinko, funkman
-  -1: 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml?rev=832597&r1=8325

Re: svn commit: r832632 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.sh webapps/docs/changelog.xml

2009-11-03 Thread Konstantin Kolinko
2009/11/4  :
> Author: markt
> Date: Wed Nov  4 00:24:43 2009
> New Revision: 832632
>
> URL: http://svn.apache.org/viewvc?rev=832632&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
> Better handling of PID files
>
> Modified:
>    tomcat/tc6.0.x/trunk/STATUS.txt
>    tomcat/tc6.0.x/trunk/bin/catalina.sh
>    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

> +
> +  SLEEP=5
> +  if [ ! -z "$1" ]; then
> +    echo $1 | grep "[^0-9]" > /dev/null 2>&1
> +    if [ $? -eq 1 ]; then
> +      SLEEP=$1
> +      shift
> +    fi
> +  fi
> +

Just a note:
I would prefer to be able to provide the default value for $SLEEP in
a setenv.sh file. These 5 seconds might be too short for some systems.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: UserConfig: alternative implementation

2009-11-03 Thread Costin Manolache
Curious: how does it scale for large number of users, in particular if you
have NFS homes ?

It would be interesting to change this to not init the contexts when tomcat
starts - just register a handler that would start the context on first
request.
Or as a Valve that looks for ~foo and then lookups and start the context for
that user on demand.

IMHO this could be a nice feature - but it's a perfect example of thing that
shouldn't be bundled in tomcat, but
available as a separate download. And if it used a scheme like /user/foo -
it may even be possible to implement it as a app+standard filter, with just
one 'internal API' call to load the context.

Costin


On Tue, Nov 3, 2009 at 3:16 PM, Mikhail Kryshen  wrote:

> Hi,
>
> I have implemented host event listener similar to
> org.apache.catalina.startup.UserConfig but with support for multiple
> webapps per user, automatic deployment and remote user databases on UNIX.
>
> Currently it is available as a separate package that could be added to
> tomcat6 classpath and referenced in server.xml.
>
> Description: http://kryshen.net/userconfig/
> Code: http://kryshen.net/userconfig/userconfig-latest.tar.gz
>
> Implementation details:
> Abstract class UserConfig extend HostConfig to reuse automatic deployment
> functionality. Two concrete implementations of UserConfig are provided:
> PasswdUserConfig uses local passwd file or getent command to list users
> and HomesUserConfig reads user home subdirectories in the specified base
> directory.
>
> I do not think it makes sense to have separate UserDatabase
> interface like in current Tomcat implementation because of tight
> coupling between the classes: UserDatabase requires UserConfig to access
> configuration properties and UserConfig have to have all properties
> needed by all UserDatabase implementations.
>
> I could contribute this code as a patch, but need to resolve some issues:
> - my implementation is not compatible with current UserConfig in Tomcat
> (brake compatibility or name it differently and provide as an alternative
> to the original UserConfig?);
> - it may be better to separate HostConfig methods useful for UserConfig
> in an abstract class to be extended by HostConfig and UserConfig;
> - javadoc comments may need correction (I'm not native English).
>
> --
> Mikhail
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>


DO NOT REPLY [Bug 47699] CATALINA_PID can be over-written by failed start

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47699

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2009-11-03 16:25:01 GMT ---
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



DO NOT REPLY [Bug 47626] File of directory which referred by symbolic link was deleted.

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47626

--- Comment #3 from Tim Funk  2009-11-03 17:11:08 UTC ---
I am thinking this is WONTFIX. If a user starts generating symlinks AND relying
on autodeploy - bad things will eventually happen.

-- 
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: r832598 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

2009-11-03 Thread markt
Author: markt
Date: Tue Nov  3 23:25:03 2009
New Revision: 832598

URL: http://svn.apache.org/viewvc?rev=832598&view=rev
Log:
Add name of patch author.

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

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=832598&r1=832597&r2=832598&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov  3 23:25:03 2009
@@ -161,8 +161,8 @@
 provided by Qingyang Xu. (kkolinko)
   
   
-47918: Correct mbean descriptors for the host deployer.
-(markt)
+47918: Correct mbean descriptors for the host deployer. 
Patch
+provided by Uwe Günther. (markt)
   
   
 48097: Make WebappClassLoader to do not swallow



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



DO NOT REPLY [Bug 47235] MySQL example should *not* include usage of the autoReconnect flag

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47235

Mark Thomas  changed:

   What|Removed |Added

 CC||reno.rkc...@free.fr

--- Comment #2 from Mark Thomas  2009-11-03 16:27:46 GMT ---
*** Bug 48080 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 47918] Wrong description in o.a.c.startup.mbeans-desriptors.xml for the HostConfig operations

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47918

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #2 from Mark Thomas  2009-11-03 15:23:58 GMT ---
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



DO NOT REPLY [Bug 48105] Transfering PNG using getResponse().getOutputStream()

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48105

Stefan Schumacher  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|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



DO NOT REPLY [Bug 48105] Transfering PNG using getResponse().getOutputStream()

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48105

--- Comment #4 from Stefan Schumacher  
2009-11-03 22:53:43 UTC ---
Can it be that the effect has something to do with mod_jk?

Thanks
Stefan

-- 
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 48105] Transfering PNG using getResponse().getOutputStream()

2009-11-03 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48105

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|REOPENED|NEEDINFO

--- Comment #5 from Konstantin Kolinko  2009-11-03 
23:55:26 UTC ---
> Can it be that the effect has something to do with mod_jk?

Do not know. At least, I know that the following exists in the code:
in o.a.catalina.connector.Response#setConnector() of tc5.5.z:

133:if ("AJP/1.3".equals(connector.getProtocol())) {
134:// default size to size of one ajp-packet
135:// Reduce HSIZE and Command = 6 Bytes
136:outputBuffer = new OutputBuffer(8184);
137:} else {
138:outputBuffer = new OutputBuffer();
139:}

The default limit on size of OutputBuffer is 8*1024 = 8192 bytes. With AJP it
is 8184 bytes.

Still, I would like to see a stacktrace from a more recent version of Tomcat
5.5 or 6.0.

Knowing the size of that c967fee0-46be-11de-27ff-001e0b6f107a_100.png or other
files that fail might also be a hint.

-- 
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