Re: ApacheMeetupsNa11 tomcat one?

2011-10-18 Thread Keiichi Fujino 
2011/10/11 jean-frederic clere :
> Hi,
>
> Do we want to "organize" a Tomcat meetup during the ApacheCon?
>

+1

I'll be there.
I am going to stay in Vancouver from Monday to Friday.


-- 
Keiichi.Fujino

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

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

2011-10-18 Thread rjung 
Author: rjung
Date: Tue Oct 18 08:19:40 2011
New Revision: 1185527

URL: http://svn.apache.org/viewvc?rev=1185527&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=1185527&r1=1185526&r2=1185527&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Oct 18 08:19:40 2011
@@ -69,14 +69,14 @@ PATCHES PROPOSED TO BACKPORT:
   Ensure requests with multiple errors do not result in multiple access log
   entries.
   http://people.apache.org/~markt/patches/2011-09-27-bug51872-tc6.patch
-  +1: markt, kkolinko
+  +1: markt, kkolinko, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51905
   Fix infinite loop in AprEndpoint shutdown if acceptor unlock
   fails. Reduce timeout before forcefully closing the socket from 30s to 10s.
   http://svn.apache.org/viewvc?rev=1176799&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
@@ -86,18 +86,18 @@ PATCHES PROPOSED TO BACKPORT:
   + Documentation updates:
   http://svn.apache.org/viewvc?rev=1184917&view=rev
   http://svn.apache.org/viewvc?rev=1184919&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Improve MimeHeaders.toString()
   http://svn.apache.org/viewvc?rev=1177246&view=rev
   (r1177125, r1177245 in trunk)
-  +1: kkolinko, markt
+  +1: kkolinko, markt, rjung
   -1:
 
 * Fix BIO + SSL + Java7
   http://svn.apache.org/viewvc?view=revision&revision=1174884
-  +1: markt
+  +1: markt, rjung
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51940
@@ -107,7 +107,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1181030&view=rev
   http://svn.apache.org/viewvc?rev=1181137&view=rev
   (1181028,1181136 in trunk)
-  +1: markt
+  +1: markt, rjung
   -1:
 
 



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

Re: AW: Bug 51334 - Federation support for Tomcat

2011-10-18 Thread Mark Thomas 
On 17/10/2011 15:29, Oliver Wulff wrote:
> Hi Mark
> 
> Thanks for your quick feedback...
> 
> There are two pieces - IDP and authenticator - where we have to
> decide how to package this.
> 
 
> Given that Tomcat doesn't support web services out of the box, I
> don't think it makes sense to ship WS-Federation as part of the
> standard Tomcat distribution. That rules out option 1 in my view.
 
> WS-Federation doesn't address federation to web services only.
> WS-Federation describes an active requestor profile (which is for web
> service clients/providers) and a passive requestor profile (which is
> for sso for web applications). The patch I applied is for the later.

OK. Understood.



> That leaves 2 or 3. I remain to be convinced that there is any
> demand for this functionality. I haven't seen any evidence (questions
> on the users list, bugs raised in Bugzilla) that folks are using the
> JSR-109 support in the extras package so I find it hard to see how
> there would be much demand for WS-Federation
 
> As mentioned above WS-Federation passive requestor profile doesn't
> relate to web services and JSR-109 at all. Instead it gives the
> tomcat community a great added value for enterprise web applications
> where authentication is externalized to another site and provides the
> basis to implement claims based authorization. This kind of
> funtionality does further enable users to use Tomcat in the cloud but
> keep the authentication within the company.
> 
> Considering this, I'd prefer to go with option 2 (extra tomcat
> module).

The lack of demand argument applies equally to WS-Federation considered
in isolation. I'd like to see that there was at least some traction
behind this in the Tomcat community before going with option 2. If we
were seeing the same number of references to WS-Federation on the users
mailing list as we see for SecurityFilter then option 2 would be a no
brainer.

Given that the key here is building up a community of users, another
possibility would be to go via the Apache incubator.

Mark

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

DO NOT REPLY [Bug 51181] Add support for Web Sockets

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181

--- Comment #16 from Manuel Vergel  2011-10-18 10:00:11 
UTC ---
+ 1 too. Greatly needed in my new projects.

-- 
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: r1185588 - /tomcat/trunk/webapps/docs/config/manager.xml

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 11:45:54 2011
New Revision: 1185588

URL: http://svn.apache.org/viewvc?rev=1185588&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045
Better document what "default" Manager implementation is.
Also added a separate section about the pathname="" trick that is used to 
disable session persistence.

Modified:
tomcat/trunk/webapps/docs/config/manager.xml

Modified: tomcat/trunk/webapps/docs/config/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/manager.xml?rev=1185588&r1=1185587&r2=1185588&view=diff
==
--- tomcat/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/trunk/webapps/docs/config/manager.xml Tue Oct 18 11:45:54 2011
@@ -43,7 +43,9 @@
   A Manager element MAY be nested inside a
   Context component.  If it is not included,
   a default Manager configuration will be created automatically, which
-  is sufficient for most requirements.
+  is sufficient for most requirements, — see
+  Standard Manager Implementation below for the details
+  of this configuration.
 
 
 
@@ -109,7 +111,7 @@
   
 
 Tomcat provides two standard implementations of Manager
-for use - the default one stores active sessions, while the optional one
+for use — the default one stores active sessions, while the 
optional one
 stores active sessions that have been swapped out (in addition to saving
 sessions across a restart of Tomcat) in a storage location that is selected
 via the use of an appropriate Store nested element.
@@ -127,8 +129,9 @@
 Absolute or relative (to the work directory for this Context)
 pathname of the file in which session state will be preserved
 across application restarts, if possible.  The default is
-"SESSIONS.ser".  See Restart
-Persistence for more information. Restart persistence may be 
+"SESSIONS.ser".See
+Persistence Across Restarts
+for more information. This persistence may be 
 disabled by setting this attribute to an empty string.
   
 
@@ -449,9 +452,9 @@ create table tomcat_sessions (
 
 
 
-  
+  
 
-Whenever Catalina is shut down normally and restarted, or when an
+Whenever Apache Tomcat is shut down normally and restarted, or when an
 application reload is triggered, the standard Manager implementation
 will attempt to serialize all currently active sessions to a disk
 file located via the pathname attribute.  All such saved
@@ -466,6 +469,17 @@ create table tomcat_sessions (
 
   
 
+  
+
+As documented above, every web application by default has
+standard manager implementation configured, and it performs session
+persistence across restarts. To disable this persistence feature, create
+a Context configuration file for your web
+application and add the following element there:
+
+
+  
+
 
 
 



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

svn commit: r1185590 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/manager.xml

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 11:48:59 2011
New Revision: 1185590

URL: http://svn.apache.org/viewvc?rev=1185590&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045
Merged revision 1185588 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045
Better document what "default" Manager implementation is.
Also added a separate section about the pathname="" trick that is used to 
disable session persistence.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 18 11:48:59 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588

Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml?rev=1185590&r1=1185589&r2=1185590&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/manager.xml Tue Oct 18 11:48:59 
2011
@@ -43,7 +43,9 @@
   A Manager element MAY be nested inside a
   Context component.  If it is not included,
   a default Manager configuration will be created automatically, which
-  is sufficient for most requirements.
+  is sufficient for most requirements, — see
+  Standard Manager Implementation below for the details
+  of this configuration.
 
 
 
@@ -109,7 +111,7 @@
   
 
 Tomcat provides two standard implementations of Manager
-fo

DO NOT REPLY [Bug 52045] Document the default Manager configuration.

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52045

Konstantin Kolinko  changed:

   What|Removed |Added

 Resolution|INVALID |FIXED

--- Comment #2 from Konstantin Kolinko  2011-10-18 
11:50:38 UTC ---
Thank you for reporting it. While I agree with Christopher that it is
documented, I see where a confusion can come from. I improved the docs in
r1185590

-- 
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: r1185596 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/config/manager.xml

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 11:57:58 2011
New Revision: 1185596

URL: http://svn.apache.org/viewvc?rev=1185596&view=rev
Log:
Merged revision 1185588 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045
Better document what "default" Manager implementation is.
Also added a separate section about the pathname="" trick that is used to 
disable session persistence.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/config/manager.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 18 11:57:58 2011
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841
 
,946686,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1042022,1042029,1042447,1042452,1042494,1044944,1044987,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1061412,1061442,1061446,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073393,1075458,1076212,1078409,1078412,1079801,1081334,1088179,1088460,1090022,1094069,1094089,1095138,1097899,1099575
 
,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1148216,1148471,1152601,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1175158,1175190,1177850,1177862,1178228,1178233
+/tomcat/trunk:601

svn commit: r1185609 - /tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 12:11:33 2011
New Revision: 1185609

URL: http://svn.apache.org/viewvc?rev=1185609&view=rev
Log:
Merged revision 1185588 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52045
Better document what "default" Manager implementation is.
Also added a separate section about the pathname="" trick that is used to 
disable session persistence.

Modified:
tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml?rev=1185609&r1=1185608&r2=1185609&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/config/manager.xml Tue Oct 18 
12:11:33 2011
@@ -43,7 +43,9 @@
   A Manager element MAY be nested inside a
   Context component.  If it is not included,
   a default Manager configuration will be created automatically, which
-  is sufficient for most requirements.
+  is sufficient for most requirements, — see
+  Standard Manager Implementation below for the details
+  of this configuration.
 
 
 
@@ -85,7 +87,7 @@
   
 
 Tomcat provides two standard implementations of Manager
-for use - the default one stores active sessions, while the optional one
+for use — the default one stores active sessions, while the 
optional one
 stores active sessions that have been swapped out (in addition to saving
 sessions across a restart of Tomcat) in a storage location that is selected
 via the use of an appropriate Store nested element.
@@ -135,8 +137,9 @@
 Absolute or relative (to the work directory for this Context)
 pathname of the file in which session state will be preserved
 across application restarts, if possible.  The default is
-"SESSIONS.ser".  See Restart
-Persistence for more information. Restart persistence may be 
+"SESSIONS.ser".See
+Persistence Across Restarts
+for more information. This persistence may be 
 disabled by setting this attribute to an empty string.
   
 
@@ -457,9 +460,9 @@ create table tomcat_sessions (
 
 
 
-  
+  
 
-Whenever Catalina is shut down normally and restarted, or when an
+Whenever Apache Tomcat is shut down normally and restarted, or when an
 application reload is triggered, the standard Manager implementation
 will attempt to serialize all currently active sessions to a disk
 file located via the pathname attribute.  All such saved
@@ -474,6 +477,17 @@ create table tomcat_sessions (
 
   
 
+  
+
+As documented above, every web application by default has
+standard manager implementation configured, and it performs session
+persistence across restarts. To disable this persistence feature, create
+a Context configuration file for your web
+application and add the following element there:
+
+
+  
+
 
 
 



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

svn commit: r1185626 - in /tomcat/trunk/webapps/docs: appdev/processes.xml appdev/source.xml config/context.xml index.xml introduction.xml jasper-howto.xml jndi-datasource-examples-howto.xml jndi-reso

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 12:39:45 2011
New Revision: 1185626

URL: http://svn.apache.org/viewvc?rev=1185626&view=rev
Log:
Replace links to Servlet and JSP specifications with a link to our wiki page.
One link still remains in appdev/introduction.html.

Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/

Modified:
tomcat/trunk/webapps/docs/appdev/processes.xml
tomcat/trunk/webapps/docs/appdev/source.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/index.xml
tomcat/trunk/webapps/docs/introduction.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
tomcat/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/trunk/webapps/docs/realm-howto.xml

Modified: tomcat/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/processes.xml?rev=1185626&r1=1185625&r2=1185626&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:39:45 2011
@@ -161,7 +161,7 @@ cvs commit
 
 Note that this is only an example web.xml file.  The full definition
 of the deployment descriptor file is in the
-http://java.sun.com/products/servlet";>Servlet Specification.
+http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification.
 
 
 

Modified: tomcat/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/source.xml?rev=1185626&r1=1185625&r2=1185626&view=diff
==
--- tomcat/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:39:45 2011
@@ -87,7 +87,7 @@ is discussed below.  All of these compon
 web/WEB-INF/ - The special configuration files required
 for your application, including the web application deployment descriptor
 (web.xml, defined in the 
-http://java.sun.com/products/servlet";>Servlet Specification), 
+http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification), 
 tag library descriptors for custom tag libraries
 you have created, and other resource files you wish to include within
 your web application.  Even though this directory appears to be a

Modified: tomcat/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1185626&r1=1185625&r2=1185626&view=diff
==
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Tue Oct 18 12:39:45 2011
@@ -50,7 +50,7 @@
   unpacked contents, as described in the Servlet Specification (version
   2.2 or later).  For more information about web application archives,
   you can download the
-  http://java.sun.com/products/servlet/download.html";>Servlet
+  http://wiki.apache.org/tomcat/Specifications";>Servlet
   Specification, and review the Tomcat
   Application Developer's Guide.
 

Modified: tomcat/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1185626&r1=1185625&r2=1185626&view=diff
==
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Tue Oct 18 12:39:45 2011
@@ -35,8 +35,8 @@
 
 This is the top-level entry point of the documentation bundle for the
 Apache Tomcat Servlet/JSP container.  Apache Tomcat version 
7.0
-implements the
-Servlet 3.0 and JavaServer Pages 2.2 specifications from the
+implements the Servlet 3.0 and JavaServer Pages 2.2
+http://wiki.apache.org/tomcat/Specifications";>specifications from 
the
 http://www.jcp.org";>Java Community Process, and includes many
 additional features that make it a useful platform for developing and deploying
 web applications and web services.

Modified: tomcat/trunk/webapps/docs/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=1185626&r1=1185625&r2=1185626&view=diff
==
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Tue Oct 18 12:39:45 2011
@@ -46,10 +46,10 @@ help.
 
 
 
-In the course of reading these documents, you'll run across a number of
+In the course of reading these documents, you will run across a number of
 terms; some specific to Tomcat, and others defined by the
-http://java.sun.com/products/servlet/";>Servlet or
-http://java.sun.com/products/jsp/";>JSP specifications.
+http://wiki.apache.org/tomcat/Specifications";>Servlet and
+JSP specifications.
 
 
 Context - In a nutshell, a Context is a

Modified: tomc

svn commit: r1185627 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/ webapps/docs/appdev/ webapps/docs/config/

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 12:42:22 2011
New Revision: 1185627

URL: http://svn.apache.org/viewvc?rev=1185627&view=rev
Log:
Merged revision 1185626 from tomcat/trunk:
Replace links to Servlet and JSP specifications with a link to our wiki page.
One link still remains in appdev/introduction.html.

Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc7.0.x/trunk/webapps/docs/appdev/source.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc7.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/realm-howto.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 18 12:42:22 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
 
,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626

Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185627&r1=1185626&r2=1185627&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:42:22 
2011
@@ -161,7 +161,7 @@ cvs commit
 
 Note t

svn commit: r1185629 - in /tomcat/tc6.0.x/trunk/webapps/docs: appdev/processes.xml appdev/source.xml config/context.xml index.xml introduction.xml jasper-howto.xml jndi-datasource-examples-howto.xml j

2011-10-18 Thread kkolinko 
Author: kkolinko
Date: Tue Oct 18 12:52:22 2011
New Revision: 1185629

URL: http://svn.apache.org/viewvc?rev=1185629&view=rev
Log:
CTR: docs
Backport of revision 1185626 from tomcat/trunk:
Replace links to Servlet and JSP specifications with a link to our wiki page.
Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/

Modified:
tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/index.xml
tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:52:22 
2011
@@ -161,7 +161,7 @@ cvs commit
 
 Note that this is only an example web.xml file.  The full definition
 of the deployment descriptor file is in the
-http://java.sun.com/products/servlet";>Servlet Specification.
+http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification.
 
 
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:52:22 2011
@@ -87,7 +87,7 @@ is discussed below.  All of these compon
 web/WEB-INF/ - The special configuration files required
 for your application, including the web application deployment descriptor
 (web.xml, defined in the 
-http://java.sun.com/products/servlet";>Servlet Specification), 
+http://wiki.apache.org/tomcat/Specifications";>Servlet 
Specification), 
 tag library descriptors for custom tag libraries
 you have created, and other resource files you wish to include within
 your web application.  Even though this directory appears to be a

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Oct 18 12:52:22 
2011
@@ -50,7 +50,7 @@
   unpacked contents, as described in the Servlet Specification (version
   2.2 or later).  For more information about web application archives,
   you can download the
-  http://java.sun.com/products/servlet/download.html";>Servlet
+  http://wiki.apache.org/tomcat/Specifications";>Servlet
   Specification, and review the Tomcat
   Application Developer's Guide.
 

Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Tue Oct 18 12:52:22 2011
@@ -60,8 +60,8 @@ Apache Tomcat 6, and using many of the A
 Apache Tomcat on a variety of platforms.
 First web application
 - An introduction to the concepts of a web application as defined
-in the http://java.sun.com/products/servlet/download.html";>Servlet
-2.4 Specification.  Covers basic organization of your web application
+in the http://wiki.apache.org/tomcat/Specifications";>Servlet
+2.5 Specification.  Covers basic organization of your web application
 source tree, the structure of a web application archive, and an
 introduction to the web application deployment descriptor
 (/WEB-INF/web.xml).

Modified: tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml Tue Oct 18 12:52:22 2011
@@ -46,10 +46,10 @@ help.
 
 
 
-In the course of reading these documents, you'll run across a number of
+In the course of reading these documents

DO NOT REPLY [Bug 52042] Possible NullPointerException in DefaultInstanceManager#processAnnotations

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52042

--- Comment #4 from Mark Thomas  2011-10-18 13:25:31 UTC ---
This error is actually most likely triggered by a simple threading bug.

However, there are differences between how the cache is intended to behave and
how it is actually implemented. Reconciling these differences is not trivial.
I'm currently working on a fix.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

DO NOT REPLY [Bug 52049] New: Incorrect setup instructions

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52049

 Bug #: 52049
   Summary: Incorrect setup instructions
   Product: Tomcat 6
   Version: unspecified
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Documentation
AssignedTo: dev@tomcat.apache.org
ReportedBy: akalen...@persicon.com
Classification: Unclassified


Hi,

in chapter 2 setup of the documentation of at least Tomcat 6 and Tomcat 7 for
the windows installation the following item is mentioned:

"Java location: The installer will use the registry or the JAVA_HOME
environment variable to determine the base path of a J2SE 5 JRE."

I think that JAVA_HOME should/must be replaced by JRE_HOME. If the variable
JAVA_HOME is exported Tomcat seems to expect a valid base path of a J2SE 5 JDK
(or J2SE 6 JDK for Tomcat 7). 

I would like to ask for an update of the corresponding manual pages. Thanks in
advance!

-- 
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 52049] Incorrect setup instructions

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52049

--- Comment #1 from Konstantin Kolinko  2011-10-18 
14:31:44 UTC ---
Yes, the text is wrong, but in a different way: the Tomcat Windows installer
does not look for JAVA_HOME or for JRE_HOME variables. It looks at the registry
only.

(Function findJavaHome in res/tomcat.nsi)

The service.bat manual service installation script does look for those
variables, but it is not what is described here.

-- 
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 52049] Incorrect setup instructions

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52049

--- Comment #2 from akalen...@persicon.com 2011-10-18 14:37:30 UTC ---
Excuse me, yes, you are correct the windows installer will use the registry. 

In this case still exporting JAVA_HOME as a pointer to the base directory of a
JRE might cause problems. 
E.g. one might deflate the plain zip-file in parallel and start the
"statup.bat" (I haven't tested whether the registry value will be used by
"startup.bat" created by windows installer).

So if the value JAVA_HOME is not used I would like to ask you to remove it or
(as in case of the startup.bat file) to correct the information. 

Don't get me wrong, it is not a big problem to me. Usally I only refer to (the
very good) documentation of Apache projects if customers want to install an
application manually. And one (no pro in IT) has chosen to install it manually
and  get's an error that the JAVA_HOME should point to JDK instead of a JRE.

-- 
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: r1185743 - /tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java

2011-10-18 Thread olamy 
Author: olamy
Date: Tue Oct 18 16:32:23 2011
New Revision: 1185743

URL: http://svn.apache.org/viewvc?rev=1185743&view=rev
Log:
[MTOMCAT-102] if there a context.xml in the war META-INF/context.xml use it for 
the context.

Modified:

tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java

Modified: 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java?rev=1185743&r1=1185742&r2=1185743&view=diff
==
--- 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java
 Tue Oct 18 16:32:23 2011
@@ -18,17 +18,20 @@ package org.apache.tomcat.maven.runner;
  * under the License.
  */
 
+import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.catalina.startup.Catalina;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.valves.AccessLogValve;
 import org.apache.tomcat.util.http.fileupload.FileUtils;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -133,6 +136,7 @@ public class Tomcat7Runner
 
 if ( this.enableNaming() )
 {
+System.setProperty( "catalina.useNaming", "true" );
 tomcat.enableNaming();
 }
 
@@ -190,17 +194,21 @@ public class Tomcat7Runner
 // add webapps
 for ( Map.Entry entry : 
this.webappWarPerContext.entrySet() )
 {
+String baseDir = null;
 if ( entry.getKey().equals( "/" ) )
 {
-tomcat.addWebapp( entry.getKey(),
-  new File( extractDirectory, 
"webapps/ROOT.war" ).getAbsolutePath() );
+baseDir = new File( extractDirectory, "webapps/ROOT.war" 
).getAbsolutePath();
 }
 else
 {
-tomcat.addWebapp( entry.getKey(),
-  new File( extractDirectory, "webapps/" + 
entry.getValue() ).getAbsolutePath() );
+baseDir = new File( extractDirectory, "webapps/" + 
entry.getValue() ).getAbsolutePath();
+}
+Context context = tomcat.addWebapp( entry.getKey(), baseDir );
+URL contextFileUrl = getContextXml( baseDir );
+if ( contextFileUrl != null )
+{
+context.setConfigFile( contextFileUrl );
 }
-
 }
 
 tomcat.start();
@@ -210,6 +218,28 @@ public class Tomcat7Runner
 
 }
 
+private URL getContextXml( String warPath )
+throws IOException
+{
+InputStream inputStream = null;
+try
+{
+URL url = new URL( "jar:file:" + warPath + 
"!/META-INF/context.xml" );
+inputStream = url.openConnection().getInputStream();
+if ( inputStream != null )
+{
+return url;
+}
+}
+finally
+{
+IOUtils.closeQuietly( inputStream );
+}
+return null;
+}
+
+//protected WebappLoader createWebappLoader()
+
 private void waitIndefinitely()
 {
 Object lock = new Object();
@@ -250,7 +280,6 @@ public class Tomcat7Runner
 }
 extractDirectory.mkdirs();
 
-
 // ensure webapp dir is here
 new File( extractDirectory, "webapps" ).mkdirs();
 



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

[jira] [Commented] (MTOMCAT-102) Add a mojo to build a standalone jar to run a web application

2011-10-18 Thread Hudson (Commented) (JIRA) 

[ 
https://issues.apache.org/jira/browse/MTOMCAT-102?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13129847#comment-13129847
 ] 

Hudson commented on MTOMCAT-102:


Integrated in TomcatMavenPlugin #51 (See 
[https://builds.apache.org/job/TomcatMavenPlugin/51/])
[MTOMCAT-102] if there a context.xml in the war META-INF/context.xml use it 
for the context.

olamy : http://svn.apache.org/viewvc/?view=rev&rev=1185743
Files : 
* 
/tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat7Runner.java


> Add a mojo to build a standalone jar to run a web application
> -
>
> Key: MTOMCAT-102
> URL: https://issues.apache.org/jira/browse/MTOMCAT-102
> Project: Apache Tomcat Maven Plugin
>  Issue Type: New Feature
>  Components: tomcat7
>Reporter: Olivier Lamy
>Assignee: Olivier Lamy
> Fix For: 2.0
>
>
> goal exec-war will create a standalone jar which will contains all tomcat 
> jars, a war to run your application with a simple java -jar 

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: 
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira



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

svn commit: r1185756 - in /tomcat/trunk/java/org/apache: catalina/core/DefaultInstanceManager.java jasper/util/FastRemovalDequeue.java

2011-10-18 Thread markt 
Author: markt
Date: Tue Oct 18 17:02:10 2011
New Revision: 1185756

URL: http://svn.apache.org/viewvc?rev=1185756&view=rev
Log:
Clean-up. No functional change.

Modified:
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java

Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1185756&r1=1185755&r2=1185756&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Tue 
Oct 18 17:02:10 2011
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -68,9 +68,9 @@ public class DefaultInstanceManager impl
 protected final ClassLoader containerClassLoader;
 protected boolean privileged;
 protected boolean ignoreAnnotations;
-private Properties restrictedFilters = new Properties();
-private Properties restrictedListeners = new Properties();
-private Properties restrictedServlets = new Properties();
+private final Properties restrictedFilters = new Properties();
+private final Properties restrictedListeners = new Properties();
+private final Properties restrictedServlets = new Properties();
 private final Map,WeakReference>> 
annotationCache =
 new WeakHashMap, WeakReference>>();
 
@@ -134,7 +134,7 @@ public class DefaultInstanceManager impl
 }
 
 @Override
-public void newInstance(Object o) 
+public void newInstance(Object o)
 throws IllegalAccessException, InvocationTargetException, 
NamingException {
 newInstance(o, o.getClass());
 }
@@ -268,7 +268,7 @@ public class DefaultInstanceManager impl
 }
 if (annotations == null) {
 annotations = new ArrayList();
-
+
 if (context != null) {
 // Initialize fields annotations for resource injection if
 // JNDI is enabled
@@ -321,7 +321,7 @@ public class DefaultInstanceManager impl
 }
 }
 }
-
+
 // Initialize methods annotations
 Method[] methods = null;
 if (Globals.IS_SECURITY_ENABLED) {
@@ -393,7 +393,7 @@ public class DefaultInstanceManager impl
 }
 postConstruct = method;
 }
-
+
 if (method.isAnnotationPresent(PreDestroy.class)) {
 if ((preDestroy != null ||
 method.getParameterTypes().length != 0) ||
@@ -415,7 +415,7 @@ public class DefaultInstanceManager impl
 null, AnnotationCacheEntryType.PRE_DESTROY));
 }
 if (annotations.size() == 0) {
-// Use common empty list to save memory 
+// Use common empty list to save memory
 annotations = Collections.emptyList();
 }
 synchronized (annotationCache) {
@@ -453,7 +453,7 @@ public class DefaultInstanceManager impl
 }
 
 Class clazz = instance.getClass();
-
+
 while (clazz != null) {
 List annotations;
 synchronized (annotationCache) {
@@ -528,7 +528,9 @@ public class DefaultInstanceManager impl
 }
 
 private void checkAccess(Class clazz) {
-if (privileged) return;
+if (privileged) {
+return;
+}
 if (Filter.class.isAssignableFrom(clazz)) {
 checkAccess(clazz, restrictedFilters);
 } else if (Servlet.class.isAssignableFrom(clazz)) {
@@ -642,7 +644,7 @@ public class DefaultInstanceManager impl
 
 return name.toString();
 }
-
+
 private static String normalize(String jndiName){
 if(jndiName != null && jndiName.startsWith("java:comp/env/")){
 return jndiName.substring(14);

Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1185756&r1=1185755&r2=1185756&view=diff
==
--- tomcat/trunk

svn commit: r1185758 - in /tomcat/trunk: java/org/apache/jasper/util/FastRemovalDequeue.java test/org/apache/jasper/util/ test/org/apache/jasper/util/TestFastRemovalDequeue.java

2011-10-18 Thread markt 
Author: markt
Date: Tue Oct 18 17:06:05 2011
New Revision: 1185758

URL: http://svn.apache.org/viewvc?rev=1185758&view=rev
Log:
Fix possible small memory leak when investigating 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52042

Added:
tomcat/trunk/test/org/apache/jasper/util/
tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
Modified:
tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java

Modified: tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java?rev=1185758&r1=1185757&r2=1185758&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java (original)
+++ tomcat/trunk/java/org/apache/jasper/util/FastRemovalDequeue.java Tue Oct 18 
17:06:05 2011
@@ -50,9 +50,9 @@ public class FastRemovalDequeue {
 /** Maximum size of the queue */
 private final int maxSize;
 /** First element of the queue. */
-private Entry first;
+protected Entry first;
 /** Last element of the queue. */
-private Entry last;
+protected Entry last;
 /** Size of the queue */
 private int size;
 
@@ -137,7 +137,9 @@ public class FastRemovalDequeue {
 Entry element = first;
 first = first.getNext();
 content = element.getContent();
-if (first != null) {
+if (first == null) {
+last =null;
+} else {
 first.setPrevious(null);
 }
 size--;
@@ -157,7 +159,9 @@ public class FastRemovalDequeue {
 Entry element = last;
 last = last.getPrevious();
 content = element.getContent();
-if (last != null) {
+if (last == null) {
+first = null;
+} else {
 last.setNext(null);
 }
 size--;

Added: tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java?rev=1185758&view=auto
==
--- tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java (added)
+++ tomcat/trunk/test/org/apache/jasper/util/TestFastRemovalDequeue.java Tue 
Oct 18 17:06:05 2011
@@ -0,0 +1,199 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+
+public class TestFastRemovalDequeue {
+
+@Test
+public void testSinglePushPop() throws Exception {
+FastRemovalDequeue q = new FastRemovalDequeue(2);
+
+Object o1 = new Object();
+
+q.push(o1);
+
+Object r = q.pop();
+
+assertEquals(o1, r);
+assertNull(q.first);
+assertNull(q.last);
+}
+
+
+@Test
+public void testDoublePushPop() throws Exception {
+FastRemovalDequeue q = new FastRemovalDequeue(2);
+
+Object o1 = new Object();
+Object o2 = new Object();
+
+q.push(o1);
+q.push(o2);
+
+assertEquals(o2, q.first.getContent());
+assertEquals(o1, q.last.getContent());
+
+Object r1 = q.pop();
+
+assertEquals(o1, r1);
+assertEquals(o2, q.first.getContent());
+assertEquals(o2, q.last.getContent());
+
+
+Object r2 = q.pop();
+assertEquals(o2, r2);
+assertNull(q.first);
+assertNull(q.last);
+}
+
+
+@Test
+public void testSingleUnpopPop() throws Exception {
+FastRemovalDequeue q = new FastRemovalDequeue(2);
+
+Object o1 = new Object();
+
+q.unpop(o1);
+
+Object r = q.pop();
+
+assertEquals(o1, r);
+assertNull(q.first);
+assertNull(q.last);
+}
+
+
+@Test
+public void testDoubleUnpopPop() throws Exception {
+FastRemovalDequeue q = new FastRemovalDequeue(2);
+
+Object o1 = new Object();
+Object o2 = new Object();
+
+q.

[Tomcat Wiki] Update of "PoweredBy" by prolanguage

2011-10-18 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "PoweredBy" page has been changed by prolanguage:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=373&rev2=374

  #pragma section-numbers 2
  = Sites, Applications, and Systems that are Powered By Tomcat =
- This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production. For security and other policy-related reasons, many 
organizations choose not to disclose the server they use. Tomcat has been 
downloaded more than 10 million times: assuming even a 1% production adoption 
rate results in more than 10 installations. As an aside for the curious, 
you can see recent Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]]. Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater. Companies that support Tomcat, such as 
[[http://www.springsource.com|SpringSource]] claim more than half of the global 
Fortune 500 as their clients.
+ This page is a list of some, in all likelihood a very small fraction 
actually, of the sites out there that use [[http://tomcat.apache.org|Apache 
Tomcat]] in production. For security and other policy-related reasons, many 
organizations choose not to disclose the server they use. Tomcat has been 
downloaded more than 10 million times: assuming even a 1% production adoption 
rate results in more than 10 installations. As an aside for the curious, 
you can see recent Tomcat download statistics on 
[[http://people.apache.org/~vgritsenko/stats/projects/tomcat.html|Vadim 
Gritsenko's page]]. Note, however, that these represent downloads from 
apache.org servers only, and not from mirrors, so they are likely to represent 
only a small minority of downloads: the total number is much (more than an 
order of magnitude) greater. Companies that support Tomcat, such as 
[[http://www.portedeurope.org|.]] claim more than half of the global Fortune 
500 as their clients.
  
  This page is organized by categories: [[#pub|sites with publications]], 
[[#user|sites added by users]], [[#surveys|independent surveys]], and 
[[#more|more]]. Anyone can and is encouraged to add to this page: please add 
your site, application, or system as you see fit. You do need to register with 
the Apache wiki system to edit this page: simply click the login or user 
preferences links at the top right of your screen to do so. Don't worry if you 
don't think it fits here or into any particular category: we would like to see 
your application listed no matter how big, how small, or how miscategorized ;) 
Some of these applications are simply compatible with, ship with, or run on 
Tomcat. Others are specifically designed or documented with Tomcat as the 
container in mind.
  

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

DO NOT REPLY [Bug 52051] New: NullPointerException when Jasper tries to compile a directory

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52051

 Bug #: 52051
   Summary: NullPointerException when Jasper tries to compile a
directory
   Product: Tomcat 6
   Version: 6.0.33
  Platform: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: ch...@christopherschultz.net
Classification: Unclassified


Created attachment 27809
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=27809
Sample webapp that demonstrates the problem.

STR:

1. Map JspServlet to /jsp/*
2. Create a directory /jsp/dir
3. Make a request to /jsp/dir

Result:
org.apache.jasper.JasperException: File "/jsp/dir" not found
   
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:56)
   
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:410)
   
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:117)
org.apache.jasper.compiler.JspUtil.getInputStream(JspUtil.java:679)
   
org.apache.jasper.xmlparser.XMLEncodingDetector.getEncoding(XMLEncodingDetector.java:109)
   
org.apache.jasper.compiler.ParserController.determineSyntaxAndEncoding(ParserController.java:337)
   
org.apache.jasper.compiler.ParserController.doParse(ParserController.java:190)
   
org.apache.jasper.compiler.ParserController.parseDirectives(ParserController.java:119)
org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:193)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:373)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:353)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:340)
   
org.apache.jasper.JspCompilationContext.compile(JspCompilationContext.java:644)
   
org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:358)
org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:389)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:333)
javax.servlet.http.HttpServlet.service(HttpServlet.java:722)

Expected: 404 Not Found response

-- 
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 52051] NullPointerException when Jasper tries to compile a directory

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52051

Christopher Schultz  changed:

   What|Removed |Added

  Component|Jasper  |Jasper
Version|6.0.33  |trunk
Product|Tomcat 6|Tomcat 7
   Target Milestone|default |---
 OS/Version||All

--- Comment #1 from Christopher Schultz  
2011-10-18 19:35:20 UTC ---
Stack trace is from Tomcat 7: changing product.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.

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

[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale

2011-10-18 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "LocalBadContent" page has been changed by ChuckCaldarale:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=33&rev2=34

  paisidesign\.com
  payrollservicesaustralia\.com
  pbali
+ portedeurope\.org
  profi-fachuebersetzung\.de
  profi-fachuebersetzungen\.de
  profischnell\.com

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

DO NOT REPLY [Bug 52055] New: ChunkedInputFilter is not recycled for servlet 3.0 asynchronous request

2011-10-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=52055

 Bug #: 52055
   Summary: ChunkedInputFilter is not recycled for servlet 3.0
asynchronous request
   Product: Tomcat 7
   Version: 7.0.22
  Platform: Macintosh
Status: NEW
  Severity: critical
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: rf...@apache.org
Classification: Unclassified


I'm using the standard servlet 3.0 async APIs with tomcat 7.0.22. The server
side code is something like the following:

final AsyncContext asyncContext = request.startAsync();

... // in a processing thread
asyncContext.getRequest().getInputStream();
... read the input stream
asyncContext.complete();

The InputStream returns 0 bytes for the HTTP post with chunking. 

After debugging, I found that the ChunkedInputFilter is reused by
org.apache.coyote.http11.AbstractInputBuffer. But it has never been recycled
(nextRequest()?) before the reuse for another request. As a result, the
endChunk flag is always true after the first request. And it always return
immediately without reading more from the buffer.

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