svn commit: r1298741 - /tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

[mturk]

Author: mturk
Date: Fri Mar  9 08:10:59 2012
New Revision: 1298741

URL: http://svn.apache.org/viewvc?rev=1298741&view=rev
Log:
Use win32 API strlen function instead casting size_t to int

Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c

Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1298741&r1=1298740&r2=1298741&view=diff
==
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Fri Mar  9 08:10:59 2012
@@ -891,7 +891,7 @@ static void write_error_response(PHTTP_F
 StringCbPrintf(body, sizeof(body), HTML_ERROR_BODY_FMT,
status_reason(err), status_title(err),
status_description(err));
-len = (DWORD)(strlen(body));
+len = lstrlenA(body);
 pfc->WriteClient(pfc, body, &len,
  HSE_IO_SYNC);
 len = ISIZEOF(HTML_ERROR_TAIL) - 1;
@@ -910,7 +910,7 @@ static void write_error_message(LPEXTENS
 DWORD len_of_error_page;
 StringCbPrintf(error_page_url, INTERNET_MAX_URL_LENGTH,
error_page, err);
-len_of_error_page = (DWORD)strlen(error_page_url);
+len_of_error_page = lstrlenA(error_page_url);
 if (!lpEcb->ServerSupportFunction(lpEcb->ConnID,
   HSE_REQ_SEND_URL_REDIRECT_RESP,
   error_page_url,
@@ -934,7 +934,7 @@ static void write_error_message(LPEXTENS
  */
 jk_log(logger, JK_LOG_WARNING,
"error header too long (%d bytes requested).",
-   strlen(err_hdrs));
+   lstrlenA(err_hdrs));
 body[0] = '\0';
 }
 }
@@ -952,7 +952,7 @@ static void write_error_message(LPEXTENS
 StringCbPrintf(body, sizeof(body), HTML_ERROR_BODY_FMT,
status_reason(err), status_title(err),
status_description(err));
-len = (DWORD)(strlen(body));
+len = lstrlenA(body);
 lpEcb->WriteClient(lpEcb->ConnID,
body, &len,
HSE_IO_SYNC);
@@ -1141,8 +1141,8 @@ static int JK_METHOD start_response(jk_w
 /* Fill in the response */
 hi.pszStatus = status_str;
 hi.pszHeader = headers_str;
-hi.cchStatus = (DWORD)strlen(status_str);
-hi.cchHeader = (DWORD)strlen(headers_str);
+hi.cchStatus = lstrlenA(status_str);
+hi.cchHeader = lstrlenA(headers_str);
 
 /*
  * Using the extended form of the API means we have to get this 
right,
@@ -1157,7 +1157,7 @@ static int JK_METHOD start_response(jk_w
   NULL, NULL);
 }
 else {
-DWORD status_str_len = (DWORD)strlen(status_str);
+DWORD status_str_len = lstrlenA(status_str);
 /* Old style response - forces Connection: close if Tomcat 
response doesn't
specify necessary details to allow keep alive */
 rc = p->lpEcb->ServerSupportFunction(p->lpEcb->ConnID,
@@ -1382,7 +1382,7 @@ static int JK_METHOD iis_write(jk_ws_ser
 jk_log(logger, JK_LOG_DEBUG,
 "Using chunked encoding - writing chunk header for %d byte 
chunk", l);
 
-if (!isapi_write_client(p, chunk_header, (unsigned 
int)strlen(chunk_header))) {
+if (!isapi_write_client(p, chunk_header, lstrlenA(chunk_header))) {
 jk_log(logger, JK_LOG_ERROR, "WriteClient for chunk header 
failed");
 JK_TRACE_EXIT(logger);
 return JK_FALSE;
@@ -1672,7 +1672,7 @@ static int ap_regexec(const ap_regex_t *
 }
 
 rc = pcre_exec((const pcre *)preg->re_pcre, NULL, string,
-   (int)strlen(string),
+   lstrlenA(string),
 0, options, ovector, nmatch * 3);
 
 if (rc == 0)
@@ -2656,7 +2656,7 @@ static int init_jk(char *serverName)
 StringCbCat(shm_name, MAX_PATH, extension_uri + 1);
 if ((p = strrchr(shm_name, '.')))
 *p = '\0';
-for(i = 0; i < strlen(shm_name); i++) {
+for(i = 0; i < lstrlenA(shm_name); i++) {
 if (!isalnum((unsigned char)shm_name[i]))
 shm_name[i] = '_';
 else
@@ -2925,7 +2925,7 @@ static int read_registry_init_data(void)
 }
 }
 if (get_config_parameter(src, LOG_FILESIZE_TAG, tmpbuf, sizeof(tmpbuf))) {
-size_t tl = strlen(tmpbuf);
+int tl = lstrlenA(tmpbuf);
 if (tl > 0) {
 /* rotatelogs has an 'M' suffix on filesize, which we optionally 
support for consistency */
 if (tmpbuf[tl - 1] == 'M') {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For ad

svn commit: r1298742 - /tomcat/jk/trunk/native/iis/pcre/config.hw

[mturk]

Author: mturk
Date: Fri Mar  9 08:18:42 2012
New Revision: 1298742

URL: http://svn.apache.org/viewvc?rev=1298742&view=rev
Log:
Silent size_t -> int warnings for win64

Modified:
tomcat/jk/trunk/native/iis/pcre/config.hw

Modified: tomcat/jk/trunk/native/iis/pcre/config.hw
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/pcre/config.hw?rev=1298742&r1=1298741&r2=1298742&view=diff
==
--- tomcat/jk/trunk/native/iis/pcre/config.hw (original)
+++ tomcat/jk/trunk/native/iis/pcre/config.hw Fri Mar  9 08:18:42 2012
@@ -104,4 +104,9 @@ Makefile (use --disable-stack-for-recurs
 
 /* #define NO_RECURSE */
 
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+#pragma warning(disable: 4244)
+#pragma warning(disable: 4267)
+#endif
+
 /* End */



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

svn commit: r1298748 - /tomcat/jk/tags/JK_1_2_33/

[mturk]

Author: mturk
Date: Fri Mar  9 08:29:26 2012
New Revision: 1298748

URL: http://svn.apache.org/viewvc?rev=1298748&view=rev
Log:
Tag 1.2.33

Added:
tomcat/jk/tags/JK_1_2_33/
  - copied from r1298747, tomcat/jk/trunk/


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

svn commit: r1298771 - in /tomcat/tc7.0.x/trunk: ./ res/ide-support/eclipse/java-compiler-errors-warnings.txt

[markt]

Author: markt
Date: Fri Mar  9 09:45:01 2012
New Revision: 1298771

URL: http://svn.apache.org/viewvc?rev=1298771&view=rev
Log:
Start to simplify the merge info.
Merge additional changes from trunk where appropriate.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 09:45:01 2012
@@ -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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
 
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
 
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129
 
0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,12

svn commit: r1298773 - /tomcat/tc7.0.x/trunk/

[markt]

Author: markt
Date: Fri Mar  9 09:51:47 2012
New Revision: 1298773

URL: http://svn.apache.org/viewvc?rev=1298773&view=rev
Log:
Simplify the merge info.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 09:51:47 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187
 
809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1
 
202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,123154
 
2-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,124237

svn commit: r1298774 - /tomcat/tc7.0.x/trunk/

[markt]

Author: markt
Date: Fri Mar  9 10:01:55 2012
New Revision: 1298774

URL: http://svn.apache.org/viewvc?rev=1298774&view=rev
Log:
Simplify merge info

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:01:55 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157163-1157859,1157862-1157942,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188
 
822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1
 
203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,123162
 
4-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,124

svn commit: r1298777 - /tomcat/tc7.0.x/trunk/

[markt]

Author: markt
Date: Fri Mar  9 10:09:35 2012
New Revision: 1298777

URL: http://svn.apache.org/viewvc?rev=1298777&view=rev
Log:
Simplify merge info

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:09:35 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1162101,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613
 
,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195
 
223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1
 
212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,123690
 
6-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,129

svn commit: r1298781 - in /tomcat/tc7.0.x/trunk: ./ res/ide-support/eclipse/java-compiler-errors-warnings.txt

[markt]

Author: markt
Date: Fri Mar  9 10:24:30 2012
New Revision: 1298781

URL: http://svn.apache.org/viewvc?rev=1298781&view=rev
Log:
Start to simplify the merge info.
Merge additional changes from trunk where appropriate.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:24:30 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1162101,1162149,1162169,1162721,1162769,1162836,1162932,1162951-1163716,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,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602
 
,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195
 
222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1
 
210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,123520
 
7,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,12

svn commit: r1298782 - /tomcat/tc7.0.x/trunk/

[markt]

Author: markt
Date: Fri Mar  9 10:29:26 2012
New Revision: 1298782

URL: http://svn.apache.org/viewvc?rev=1298782&view=rev
Log:
More merge info simplification

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:29:26 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1162101,1162149,1162169,1162721,1162769,1162836,1162932,1162951-1163716,1163718-1166689,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,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,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125
 
,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198
 
607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1
 
225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,124108
 
7,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298628-1298629
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1162101,1162149,1162169,1162721,1162769,1162836,1162932,1162951-1163716,1163718-1166689,1166691-1173891,1174061,1

svn commit: r1298783 - /tomcat/tc7.0.x/trunk/

[markt]

Author: markt
Date: Fri Mar  9 10:35:03 2012
New Revision: 1298783

URL: http://svn.apache.org/viewvc?rev=1298783&view=rev
Log:
More merge info simplification

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:35:03 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1162101,1162149,1162169,1162721,1162769,1162836,1162932,1162951-1163716,1163718-1166689,1166691-1173891,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379
 
,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201
 
237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1
 
229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-129701
 
5,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298628-1298629
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1173891,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1

[jira] [Created] (MTOMCAT-125) mvn tomcat7:run got "javax.naming.NameNotFoundException: Name jdbc is not bound in this Context"

[guofeng zhang (Created) (JIRA)]

mvn tomcat7:run got "javax.naming.NameNotFoundException: Name jdbc is not bound 
in this Context"


 Key: MTOMCAT-125
 URL: https://issues.apache.org/jira/browse/MTOMCAT-125
 Project: Apache Tomcat Maven Plugin
  Issue Type: Bug
  Components: tomcat7
Affects Versions: 2.0-beta-1
 Environment: JDK 7, Tomcat 7.0.25, tomcat7-maven-plugin/2.0-beta-1
Reporter: guofeng zhang
Assignee: Olivier Lamy


I configured the datatsource as global naming datasource in server.xml,
  


The server.xml is copied to src\main\tomcatconf, (this also copyied by the 
plugin to target\tomcat\conf, so it is used).

then in webapp/META-INF/context.xml, I have:
   

And in web.xml:

datasoruce
jdbc/iviewDS
javax.sql.DataSource
Container

In my code, I lookup the datasource using 'java:/comp/env/jdbc/iviewDS'.

This works well when I deploy the app into tomcat/app directory.


--
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: r1298786 - in /tomcat/tc7.0.x/trunk: ./ webapps/examples/jsp/index.html

[markt]

Author: markt
Date: Fri Mar  9 10:52:10 2012
New Revision: 1298786

URL: http://svn.apache.org/viewvc?rev=1298786&view=rev
Log:
More merge info simplification.
Merge additional changes from trunk where appropriate.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 10:52:10 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1173891,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892
 
,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201
 
556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1
 
230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,129772
 
2,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298628-1298629
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,

svn commit: r1298792 - in /tomcat/site/trunk: docs/tools.html xdocs/tools.xml

[markt]

Author: markt
Date: Fri Mar  9 11:34:46 2012
New Revision: 1298792

URL: http://svn.apache.org/viewvc?rev=1298792&view=rev
Log:
Add UCDetector and FindBugs to the tools page

Modified:
tomcat/site/trunk/docs/tools.html
tomcat/site/trunk/xdocs/tools.xml

Modified: tomcat/site/trunk/docs/tools.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1298792&r1=1298791&r2=1298792&view=diff
==
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Fri Mar  9 11:34:46 2012
@@ -303,6 +303,30 @@ and a committer should be able to fix it
 
 
 
+
+  
+http://www.ucdetector.org/"; rel="nofollow">
+  http://www.ucdetector.org/ucdetector32.png";>
+  
+The Unnecessary Code Detector is used by the Tomcat developers to
+  identify code to be removed from future versions of Tomcat.
+  
+
+
+
+
+
+  
+http://findbugs.sourceforge.net/"; rel="nofollow">
+  http://findbugs.sourceforge.net/buggy-sm.png";>
+  
+FindBugs is used by the Tomcat developers to identify potential coding
+  errors.
+  
+
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/tools.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/tools.xml?rev=1298792&r1=1298791&r2=1298792&view=diff
==
--- tomcat/site/trunk/xdocs/tools.xml (original)
+++ tomcat/site/trunk/xdocs/tools.xml Fri Mar  9 11:34:46 2012
@@ -41,6 +41,20 @@ and a committer should be able to fix it
   the Eclipse IDE.
   
 
+
+  http://www.ucdetector.org/"; rel="nofollow">
+  http://www.ucdetector.org/ucdetector32.png"/>
+  The Unnecessary Code Detector is used by the Tomcat developers to
+  identify code to be removed from future versions of Tomcat.
+  
+
+
+  http://findbugs.sourceforge.net/"; rel="nofollow">
+  http://findbugs.sourceforge.net/buggy-sm.png"/>
+  FindBugs is used by the Tomcat developers to identify potential coding
+  errors.
+  
+
 
 
 



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

svn commit: r1298793 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

[markt]

Author: markt
Date: Fri Mar  9 11:50:45 2012
New Revision: 1298793

URL: http://svn.apache.org/viewvc?rev=1298793&view=rev
Log:
Use final where suggested by the UCDetector

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1298793&r1=1298792&r2=1298793&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Mar  9 
11:50:45 2012
@@ -95,35 +95,35 @@ class Generator {
 "org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
 "true")).booleanValue();
 
-private ServletWriter out;
+private final ServletWriter out;
 
-private ArrayList methodsBuffered;
+private final ArrayList methodsBuffered;
 
-private FragmentHelperClass fragmentHelperClass;
+private final FragmentHelperClass fragmentHelperClass;
 
-private ErrorDispatcher err;
+private final ErrorDispatcher err;
 
-private BeanRepository beanInfo;
+private final BeanRepository beanInfo;
 
-private Set varInfoNames;
+private final Set varInfoNames;
 
-private JspCompilationContext ctxt;
+private final JspCompilationContext ctxt;
 
-private boolean isPoolingEnabled;
+private final boolean isPoolingEnabled;
 
-private boolean breakAtLF;
+private final boolean breakAtLF;
 
 private String jspIdPrefix;
 
 private int jspId;
 
-private PageInfo pageInfo;
+private final PageInfo pageInfo;
 
-private Vector tagHandlerPoolNames;
+private final Vector tagHandlerPoolNames;
 
 private GenBuffer charArrayBuffer;
 
-private DateFormat timestampFormat;
+private final DateFormat timestampFormat;
 
 /**
  * @param s
@@ -276,7 +276,7 @@ class Generator {
 
 class TagHandlerPoolVisitor extends Node.Visitor {
 
-private Vector names;
+private final Vector names;
 
 /*
  * Constructor
@@ -354,7 +354,7 @@ class Generator {
 
 class ScriptingVarVisitor extends Node.Visitor {
 
-private Vector vars;
+private final Vector vars;
 
 ScriptingVarVisitor() {
 vars = new Vector();
@@ -754,9 +754,9 @@ class Generator {
  * handlers: : tag short name : introspection info of tag
  * handler for  tag
  */
-private Hashtable> 
handlerInfos;
+private final Hashtable> 
handlerInfos;
 
-private Hashtable tagVarNumbers;
+private final Hashtable tagVarNumbers;
 
 private String parent;
 
@@ -770,13 +770,13 @@ class Generator {
 
 private boolean isFragment;
 
-private boolean isTagFile;
+private final boolean isTagFile;
 
 private ServletWriter out;
 
-private ArrayList methodsBuffered;
+private final ArrayList methodsBuffered;
 
-private FragmentHelperClass fragmentHelperClass;
+private final FragmentHelperClass fragmentHelperClass;
 
 private int methodNesting;
 
@@ -1401,7 +1401,7 @@ class Generator {
  */
 class ParamVisitor extends Node.Visitor {
 
-private boolean ie;
+private final boolean ie;
 
 ParamVisitor(boolean ie) {
 this.ie = ie;
@@ -3446,6 +3446,8 @@ class Generator {
 breakAtLF = ctxt.getOptions().getMappedFile();
 if (isPoolingEnabled) {
 tagHandlerPoolNames = new Vector();
+} else {
+tagHandlerPoolNames = null;
 }
 timestampFormat = new SimpleDateFormat("-MM-dd HH:mm:ss");
 timestampFormat.setTimeZone(TimeZone.getTimeZone("UTC"));



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

svn commit: r1298794 - /tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

[markt]

Author: markt
Date: Fri Mar  9 11:51:42 2012
New Revision: 1298794

URL: http://svn.apache.org/viewvc?rev=1298794&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52776
Refactor the code so JspFragment.invoke cleans up after itself.
Patch provided by Karl von Randow.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1298794&r1=1298793&r2=1298794&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Mar  9 
11:51:42 2012
@@ -2132,9 +2132,6 @@ class Generator {
 out.println(");");
 }
 
-// Restore EL context
-
out.printil("jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,getJspContext());");
-
 n.setEndJavaLine(out.getJavaLine());
 }
 
@@ -4221,6 +4218,7 @@ class Generator {
 out.printil("}");
 out.printil("try {");
 out.pushIndent();
+out.printil("Object _jspx_saved_JspContext = 
this.jspContext.getELContext().getContext(javax.servlet.jsp.JspContext.class);");
 
out.printil("this.jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,this.jspContext);");
 out.printil("switch( this.discriminator ) {");
 out.pushIndent();
@@ -4233,6 +4231,10 @@ class Generator {
 }
 out.popIndent();
 out.printil("}"); // switch
+
+// restore nested JspContext on ELContext
+
out.printil("jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,_jspx_saved_JspContext);");
+
 out.popIndent();
 out.printil("}"); // try
 out.printil("catch( java.lang.Throwable e ) {");



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

svn commit: r1298796 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Generator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar  9 11:54:13 2012
New Revision: 1298796

URL: http://svn.apache.org/viewvc?rev=1298796&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52776
Refactor the code so JspFragment.invoke cleans up after itself.
Patch provided by Karl von Randow.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 11:54:13 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298628-1298629
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137

DO NOT REPLY [Bug 52776] Generator's JspFragment.invoke implementation does not reset ELContext[JspContext.class]

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52776

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2012-03-09 11:54:50 UTC ---
Thanks for the patch.

This has been fixed in trunk and 7.0.x and will be included in 7.0.27 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

[VOTE] Release Apache Tomcat Connectors 1.2.33

[Mladen Turk]

Release candidate artefacts [1] based on tag [2] are ready for vote.
The vote will stay open for at least 72 hours.

Apache Tomcat Connectors 1.2.33 release candidate is
 [+1] Stable, release
 [-1] Do not release because of ...


  [1] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_33
  [2] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.33


Regards
--
^TM

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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2838

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1298794
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

svn commit: r1298809 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar  9 12:29:20 2012
New Revision: 1298809

URL: http://svn.apache.org/viewvc?rev=1298809&view=rev
Log:
Clean-up

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1298809&r1=1298808&r2=1298809&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Mar  9 12:29:20 2012
@@ -71,7 +71,7 @@
 52500: Added configurable mechanism to retrieve user names
 from X509 client certificates. Based on a patch provided by
 Michael Furman. (schultz)
-  fix>
+  
   
 52719: Fix a theoretical resource leak in the JAR validation
 that checks for non-permitted classes in web application JARs. (markt)



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

Re: svn commit: r1298590 - in /tomcat/trunk/java/org/apache/catalina/realm: RealmBase.java X509SubjectDnRetriever.java

[Christopher Schultz]

Mark,

On 3/8/12 4:25 PM, ma...@apache.org wrote:
> Author: markt
> Date: Thu Mar  8 21:25:31 2012
> New Revision: 1298590
> 
> URL: http://svn.apache.org/viewvc?rev=1298590&view=rev
> Log:
> Fix various Checkstyle / Eclipse warnings and failures

This built cleanly for me, and all (expected) tests passed.

I saw the buildbot complaint, but I couldn't find any actual errors in
the build. The only thing I could make sense of was the javadoc
warnings, so I fixed those.

> Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298590&r1=1298589&r2=1298590&view=diff
> ==
>  
> @@ -1440,7 +1440,7 @@ public abstract class RealmBase extends 
>  try {
>  @SuppressWarnings("unchecked")
>  Class clazz = (Class X509UsernameRetriever>)Class.forName(className);
> -return (X509UsernameRetriever)clazz.newInstance();
> +return clazz.newInstance();

This was actually intentional: I want the new object to be cast to
X509UsernameRetriever *here* so we can catch and re-throw an exception
with a nice error message. I didn't check the bytecode, but I assumed
that without a cast, no type-check would occur. Working with Java's
generics makes my head hurt.

Shall I make these same changes in 7.0.x?

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1298809 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

[Christopher Schultz]

Mark,

On 3/9/12 7:29 AM, ma...@apache.org wrote:
> Author: markt
> Date: Fri Mar  9 12:29:20 2012
> New Revision: 1298809
> 
> URL: http://svn.apache.org/viewvc?rev=1298809&view=rev
> Log:
> Clean-up

I pretty much boned that whole commit, eh?

I'm very sorry for the noise.

-chris



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r1298590 - in /tomcat/trunk/java/org/apache/catalina/realm: RealmBase.java X509SubjectDnRetriever.java

[Mark Thomas]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 09/03/2012 14:33, Christopher Schultz wrote:
> Mark,
> 
> On 3/8/12 4:25 PM, ma...@apache.org wrote:
>> Author: markt Date: Thu Mar  8 21:25:31 2012 New Revision:
>> 1298590
>> 
>> URL: http://svn.apache.org/viewvc?rev=1298590&view=rev Log: Fix
>> various Checkstyle / Eclipse warnings and failures
> 
> This built cleanly for me, and all (expected) tests passed.
> 
> I saw the buildbot complaint, but I couldn't find any actual errors
> in the build. The only thing I could make sense of was the javadoc 
> warnings, so I fixed those.
> 
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL:
>> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1298590&r1=1298589&r2=1298590&view=diff
>>
>> 
==
>> 
>> @@ -1440,7 +1440,7 @@ public abstract class RealmBase extends try
>> { @SuppressWarnings("unchecked") Class> X509UsernameRetriever> clazz = (Class> X509UsernameRetriever>)Class.forName(className); -
>> return (X509UsernameRetriever)clazz.newInstance(); +
>> return clazz.newInstance();
> 
> This was actually intentional: I want the new object to be cast to 
> X509UsernameRetriever *here* so we can catch and re-throw an
> exception with a nice error message. I didn't check the bytecode,
> but I assumed that without a cast, no type-check would occur.
> Working with Java's generics makes my head hurt.

Eclipse reports the cast is unnecessary which is what I would expect
looking at the code.

> Shall I make these same changes in 7.0.x?

Consistency is good.

Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJPWhaYAAoJEBDAHFovYFnn8kQP/1FtUH8Vqle4aQqoItqBF9zR
dOIewVIW738/VNXnUmEWBwzUAK/SnnikB7g6xdYxSfvHOhwO1DVIPdGz/13GjdSF
GJK61H4iM8f3eRkmcLeFGo6oCbbxhMJyf2Q2tb1m+312PbfpyvvPDnBskDybIXvJ
SQBFcycxEhyfEiIQCh0HfvhQafCA+rJz9Au9UtPny5oHSPAwoHDf0beR+X0Rc1xz
gagUz7TeADBMi6nnsIRwI0TVZX7EZVaO7OiTXugX7PFY9xDC6d1Ff7QwJesRCYh8
/rAJMujSud3L+oBwYR4uACQenO9sdz/Vocr2v5INrRSeqv4kSleK6SrdH1Ngkv3D
UHOJVnRIbK1akloq9NqoMdPXGA6G6JmAHZq13t+l7SSUrunOgUIec/PmQFAzkfDF
pKA5zBnV9YCuNvTRM0HwIepT4CKATDCni9zJsDo7IE4LCLAIdp+McGff00pCq2yE
kx5Ux91KmbJ78e61YryPz4oicHpTfn5N3bm0Nonb0hEY/cFzyNx2vdCP6RxwdgK0
0DP9pWtTsDfOUR49BdpiuT6CTnh5tvsxVeez46OduRfvwDS4aaH6LRMQiWgVnFf1
BjFTUFLJsW0QWJeMwpIp/7oUzh99/OCnOTF5bh8xXYlZco8/s2+Kj5SmbdijfSYs
i/TV13gEEnC7+0lszHqd
=d6q1
-END PGP SIGNATURE-

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

DO NOT REPLY [Bug 52833] NPE with 7.0.26

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52833

--- Comment #4 from Mark Thomas  2012-03-09 15:09:56 UTC ---
I'm not exactly sure what is going on here as I can't repeat this with a simple
test case. However, it does appear that r1242101 is the root cause.

I can only repeat this is I set Catalina's parent class loader to null. I guess
that is what the plug-in code is doing somewhere and while in the past it has
got away with it, as a result of r1242101 it is now failing.

I'm having a hard time coming up with a valid reason for setting the parent
class loader to null. I am therefore leaning towards INVALID for this, although
I'm not adverse to adding a null check to setParentClassLoader() and throwing
an IAE if null is passed in to make this easier to debug.

-- 
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 52850] Various miscellaneous fixes to Tomcat Memory Leak Detection code

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52850

--- Comment #5 from Mark Thomas  2012-03-09 15:29:13 UTC ---
(In reply to comment #0)
> - Most of the detection and fixing code has been tested ONLY on Sun JVMs.
Correct.

> - Tests in tomcat7.source\test\org\apache\catalina\loader do not seem to run
> successfully and are incomplete for all the protection that Tomcat provides 
> for
> classloader memory leaks.
The tests that are present do work. Yes, code coverage of the tests is a long
way from 100%.

> - For some categories of threadlocal memory leaks the key and value are not
> displayed correctly in the warning messages; particularly ones dealing with
> indirect references to threadlocals
I don't see any changes to address this. Did I miss them?

> -  org.apache.catalina.loader.WebappClassLoader.loadedByThisOrChild(Object)
> incorrectly traverses the object classloader hierarchy instead of the current
> (this) classloader hierarchy
No. The test is not "loaded by this or parent", it is "loaded by this or child"
and is correct.

I haven't looked at the tests yet. I'll commit the fixes (less the change to
WebappClassLoader.loadedByThisOrChild(Object)) with the tests once I have
reviewed the new tests.

-- 
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: [GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

[Stefan Bodewig]

Hi all,

The reason you get these nags is that your taglib POMs refer to a parent
POM of version 1-SNAPSHOT while the parent in svn is 2-SNAPSHOT and
Maven doesn't ask any repository for the parent (likely because it's a
SNAPSHOT) or otherwise Gump would hand out your trunk version.

Could you please change it to the released parent POM version 1 or to
2-SNAPSHOT?  Jelly depends on it, and some other projects depend on
Jelly.

Thanks

Stefan

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

svn commit: r1298971 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/RealmBase.java java/org/apache/catalina/realm/X509SubjectDnRetriever.java

[schultz]

Author: schultz
Date: Fri Mar  9 18:36:37 2012
New Revision: 1298971

URL: http://svn.apache.org/viewvc?rev=1298971&view=rev
Log:
Back-ported two cleanup patches from markt.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/X509SubjectDnRetriever.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 18:36:37 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298628-1298629,1298794
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1

svn commit: r1298983 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java test/org/apache/catalina/lo

[markt]

Author: markt
Date: Fri Mar  9 19:08:49 2012
New Revision: 1298983

URL: http://svn.apache.org/viewvc?rev=1298983&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52850
Enable the memoey leak protection code to play nicely with IBM JVMs as
well as Oracle JVMs.
Extend test case coverage of memory leak protection.
Patch provided by Rohit Kelapure.

Added:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1298983&r1=1298982&r2=1298983&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Mar 
 9 19:08:49 2012
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
@@ -2244,8 +2245,7 @@ public class WebappClassLoader
 }
 
 // TimerThread can be stopped safely so treat separately
-if (thread.getClass().getName().equals(
-"java.util.TimerThread") &&
+if 
(thread.getClass().getName().startsWith("java.util.Timer") &&
 clearReferencesStopTimerThreads) {
 clearReferencesStopTimerThread(thread);
 continue;
@@ -2268,20 +2268,28 @@ public class WebappClassLoader
 // If the thread has been started via an executor, try
 // shutting down the executor
 try {
-Field targetField =
-thread.getClass().getDeclaredField("target");
-targetField.setAccessible(true);
-Object target = targetField.get(thread);
-
-if (target != null &&
-target.getClass().getCanonicalName().equals(
-
"java.util.concurrent.ThreadPoolExecutor.Worker")) {
-Field executorField =
-target.getClass().getDeclaredField("this$0");
-executorField.setAccessible(true);
-Object executor = executorField.get(target);
-if (executor instanceof ThreadPoolExecutor) {
-((ThreadPoolExecutor) executor).shutdownNow();
+
+Field targetField = null;
+try {
+targetField = 
thread.getClass().getDeclaredField("target");
+}catch (NoSuchFieldException nfe){
+targetField = 
thread.getClass().getDeclaredField("runnable");
+}
+if (null != targetField){
+targetField.setAccessible(true);
+Object target = targetField.get(thread);
+
+if (target != null &&
+target.getClass().getCanonicalName() != 
null
+&& 
target.getClass().getCanonicalName().equals(
+
"java.util.concurrent.ThreadPoolExecutor.Worker")) {
+Field executorField =
+
target.getClass().getDeclaredField("this$0");
+executorField.setAccessible(true);
+Object executor = executorField.get(target);
+if (executor instanceof ThreadPoolExecutor) {
+((ThreadPoolExecutor) 
executor).shutdownNow();
+}
 }
 }
 } catch (SecurityException e) {
@@ -2350,21 +2358,33 @@ public class WebappClassLoader
 // - queue.clear()
 
 try {
-Field newTasksMayBeScheduledField =
-thread.getClass().getDeclaredField("newTasksMayBeScheduled");
-newTasksMayBeScheduledField.setAccessible(true);
-Field queueField = thread.getClass().getDeclaredField("queue");
-queueField.setAccessible(true);
-
-Object queue = queueField.get(thread);
-
-Method cl

svn commit: r1298984 - in /tomcat/trunk/test/org/apache/catalina/loader: TestWebappClassLoaderExecutorMemoryLeak.java TestWebappClassLoaderThreadLocalMemoryLeak.java

[markt]

Author: markt
Date: Fri Mar  9 19:10:09 2012
New Revision: 1298984

URL: http://svn.apache.org/viewvc?rev=1298984&view=rev
Log:
Fix eol

Modified:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
   (props changed)

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
   (props changed)

Propchange: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
--
svn:eol-style = native

Propchange: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
--
svn:eol-style = native



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

svn commit: r1298986 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/loader/ test/org/apache/catalina/loader/ webapps/docs/

[markt]

Author: markt
Date: Fri Mar  9 19:13:18 2012
New Revision: 1298986

URL: http://svn.apache.org/viewvc?rev=1298986&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52850
Enable the memoey leak protection code to play nicely with IBM JVMs as
well as Oracle JVMs.
Extend test case coverage of memory leak protection.
Patch provided by Rohit Kelapure.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
   (props changed)
  - copied unchanged from r1298983, 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
   (props changed)
  - copied unchanged from r1298983, 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 19:13:18 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121

DO NOT REPLY [Bug 52850] Various miscellaneous fixes to Tomcat Memory Leak Detection code

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52850

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #6 from Mark Thomas  2012-03-09 19:13:54 UTC ---
Fixed in trunk and 7.0.x and will be included in 7.0.27 onwards.

Many thanks for the patch.

-- 
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 52853] @HandlesTypes not resolving classes when added as repository directory

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52853

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-03-09 19:24:13 UTC ---
Supporting locations for JARs outside of WEB-INF/lib and classes outside of
WEB-INF/classes goes beyond what the specification requires but since they are
regularly requested features Tomcat does have mechanisms for doing this.

However, for performance reasons, not all of the functionality that is enabled
for the standard WEB-INF locations works for the extended locations. In this
case, JARs are scanned by default, directories are not. To change this you need
to explicitly configure the JarScanner [1] with scanAllDirectories="true".

The users list is the place to seek further assistance if you require it.

[1] http://tomcat.apache.org/tomcat-7.0-doc/config/jar-scanner.html

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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2839

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1298984
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52718] An incomplete fix for the resource leak bug in NioEndpoint.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52718

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID

--- Comment #3 from Mark Thomas  2012-03-09 19:47:19 UTC ---
There are multiple run() methods in various classes in that file and none match
the quoted above in 6.0.x, 7.0.x or trunk.

-- 
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: r1299016 - /tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

[markt]

Author: markt
Date: Fri Mar  9 20:07:35 2012
New Revision: 1299016

URL: http://svn.apache.org/viewvc?rev=1299016&view=rev
Log:
Use final where suggested by the UCDectector

Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1299016&r1=1299015&r2=1299016&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Fri Mar  9 
20:07:35 2012
@@ -136,16 +136,16 @@ public abstract class ManagerBase extend
 
 protected static final int TIMING_STATS_CACHE_SIZE = 100;
 
-protected Deque sessionCreationTiming =
+protected final Deque sessionCreationTiming =
 new LinkedList();
 
-protected Deque sessionExpirationTiming =
+protected final Deque sessionExpirationTiming =
 new LinkedList();
 
 /**
  * Number of sessions that have expired.
  */
-protected AtomicLong expiredSessions = new AtomicLong(0);
+protected final AtomicLong expiredSessions = new AtomicLong(0);
 
 
 /**
@@ -202,7 +202,8 @@ public abstract class ManagerBase extend
 /**
  * The property change support for this component.
  */
-protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+protected final PropertyChangeSupport support =
+new PropertyChangeSupport(this);
 
 
 // - Properties
@@ -1286,8 +1287,8 @@ public abstract class ManagerBase extend
 // --- Inner 
classes
 
 protected static final class SessionTiming {
-private long timestamp;
-private int duration;
+private final long timestamp;
+private final int duration;
 
 public SessionTiming(long timestamp, int duration) {
 this.timestamp = timestamp;



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

svn commit: r1299017 - in /tomcat/trunk: java/org/apache/catalina/session/ManagerBase.java res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Fri Mar  9 20:08:42 2012
New Revision: 1299017

URL: http://svn.apache.org/viewvc?rev=1299017&view=rev
Log:
Filter an issue we can live with. Add comment to code explaining why.

Modified:
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1299017&r1=1299016&r2=1299017&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Fri Mar  9 
20:08:42 2012
@@ -775,6 +775,9 @@ public abstract class ManagerBase extend
 
 do {
 if (result != null) {
+// Not thread-safe but if one of multiple increments is lost
+// that is not a big deal since the fact that there was any
+// duplicate is a much bigger issue.
 duplicates++;
 }
 

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1299017&r1=1299016&r2=1299017&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Mar  9 20:08:42 
2012
@@ -89,6 +89,12 @@
 
   
   
+
+
+
+
+  
+  
 
 
 



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

DO NOT REPLY [Bug 52720] An incomplete fix for the resource leak bugs in ManagerBase.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52720

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||WONTFIX
 OS/Version||All
   Severity|critical|enhancement

--- Comment #1 from Mark Thomas  2012-03-09 20:13:04 UTC ---
(In reply to comment #0)
> When the statements at lines 256 throw any eception,

If that happens, the container will have much bigger problems than a resource
leak.

> Besides that, when DataInputStream is created unsuccessfully but the  temp
> FileInputStream object is created successfully at lines 250,  the temp
> FileInputStream object will be leak. 

Again, the type of exception that could trigger that to happen is going to
represent far bigger problems than a resource leak.


> The Same problem is also existed in the method of "setRandomFile".

See above.

There isn't anything here that is actually going to cause a problem for a user.
I am therefore dropping the severity to a realistic level.

These issues do not exist in later versions since the session ID generation has
been refactored.

Simply using a finally block will not achieve the desired outcome.

Given the extremely low chances of this ever happening and that for it to
happen something far worse has to go wrong (such as an OOME) I am resolving
this as WONTFIX.

-- 
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: r1299020 - in /tomcat/trunk/test/org/apache/catalina/loader: TestWebappClassLoaderExecutorMemoryLeak.java TestWebappClassLoaderThreadLocalMemoryLeak.java

[markt]

Author: markt
Date: Fri Mar  9 20:15:48 2012
New Revision: 1299020

URL: http://svn.apache.org/viewvc?rev=1299020&view=rev
Log:
Fix checkstyle warnings I missed earlier

Modified:

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java?rev=1299020&r1=1299019&r2=1299020&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java
 Fri Mar  9 20:15:48 2012
@@ -28,11 +28,12 @@ import javax.servlet.http.HttpServletRes
 
 import junit.framework.Assert;
 
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
-import org.junit.Test;
 
 public class TestWebappClassLoaderExecutorMemoryLeak extends TomcatBaseTest {
 

Modified: 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java?rev=1299020&r1=1299019&r2=1299020&view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
 (original)
+++ 
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
 Fri Mar  9 20:15:48 2012
@@ -25,11 +25,12 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.junit.Test;
 
 public class TestWebappClassLoaderThreadLocalMemoryLeak extends TomcatBaseTest 
{
 
@@ -126,7 +127,7 @@ public class TestWebappClassLoaderThread
 }
 
 static class ThreadScopedHolder {
-private final static ThreadLocal> threadLocal =
+private static final ThreadLocal> threadLocal =
 new ThreadLocal>();
 
 public static void saveInHolder(List o) {



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

svn commit: r1299021 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryL

[markt]

Author: markt
Date: Fri Mar  9 20:16:48 2012
New Revision: 1299021

URL: http://svn.apache.org/viewvc?rev=1299021&view=rev
Log:
Fix checkstyle warnings I missed earlier

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java

tomcat/tc7.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 20:16:48 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1

DO NOT REPLY [Bug 52721] An incomplete fix for the resource leak bug in StandardContext.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52721

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-03-09 20:20:04 UTC ---
That method is unused. Since it is private, it could be removed. There is no
issue 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 52722] An incomplete fix for the resource leak bug in HTMLManagerServlet.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52722

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID
 OS/Version||All

--- Comment #1 from Mark Thomas  2012-03-09 20:24:51 UTC ---
r412780 had nothing to do with resolving a resource leak.

There is no "cacheContext" method in the quoted class.

Having tracked down the correct code, there is no leak here. The container
*always* closing the Stream/Writer regardless of whether the app does or not.

-- 
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: r1299033 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

[markt]

Author: markt
Date: Fri Mar  9 20:32:11 2012
New Revision: 1299033

URL: http://svn.apache.org/viewvc?rev=1299033&view=rev
Log:
Use final where suggested by the UCDectector

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1299033&r1=1299032&r2=1299033&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Fri Mar  
9 20:32:11 2012
@@ -100,7 +100,7 @@ public class StandardManager extends Man
 /**
  * The descriptive name of this Manager implementation (for logging).
  */
-protected static String name = "StandardManager";
+protected static final String name = "StandardManager";
 
 
 /**



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

svn commit: r1299034 - /tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

[markt]

Author: markt
Date: Fri Mar  9 20:32:50 2012
New Revision: 1299034

URL: http://svn.apache.org/viewvc?rev=1299034&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
Clean-up

Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1299034&r1=1299033&r2=1299034&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Fri Mar  
9 20:32:50 2012
@@ -358,20 +358,41 @@ public class StandardManager extends Man
 if (log.isDebugEnabled())
 log.debug(sm.getString("standardManager.unloading", pathname));
 FileOutputStream fos = null;
+BufferedOutputStream bos = null;
 ObjectOutputStream oos = null;
+boolean error = false;
 try {
 fos = new FileOutputStream(file.getAbsolutePath());
-oos = new ObjectOutputStream(new BufferedOutputStream(fos));
+bos = new BufferedOutputStream(fos);
+oos = new ObjectOutputStream(bos);
 } catch (IOException e) {
+error = true;
 log.error(sm.getString("standardManager.unloading.ioe", e), e);
-if (fos != null) {
-try {
-fos.close();
-} catch (IOException f) {
-// Ignore
+throw e;
+} finally {
+if (error) {
+if (oos != null) {
+try {
+oos.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
+if (bos != null) {
+try {
+bos.close();
+} catch (IOException ioe) {
+// Ignore
+}
+}
+if (fos != null) {
+try {
+fos.close();
+} catch (IOException ioe) {
+// Ignore
+}
 }
 }
-throw e;
 }
 
 // Write the number of active sessions, followed by the details



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

svn commit: r1299036 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/session/StandardManager.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Mar  9 20:33:59 2012
New Revision: 1299036

URL: http://svn.apache.org/viewvc?rev=1299036&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
Clean-up

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  9 20:33:59 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339
 
,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208
 
145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,1231290,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231624-1231625,1231630,1231654-1231655,1231738,1231740,1231762-1231763,1231856,1231886,1231923,1231947,1232345,1232368,1232380,1232447,1232760,1232813,1232842-1232843,1
 
232869,1233413,1233423,1233426,1234143,1234567,1235207,1236906-1236907,1236914,1237146,1237154-1237156,1237332,1237334,1237425,1237427,1237604,1237975,1237981,1237985,1238070,1238073,1239024,1239048,1239050,1239060,1239135,1239483,1239485,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240697,1240795,1240821,1240842,1240857,1241087,1241160,1241908-1241909,1241982,1242099,1242110,1242371,1242434,1242495,1242947,1243034,1243038,1244302,1244511,1244567,1244718-1244719,1244935-1244938,1245274,1245449,1245849,1290875,1292334,1292338,1292345-1292347,1293155,1293831-1293832,1295998,1297014-1297015,1297017,1297158,1297177,1297202,1297209,1297213,1297717,1297722,1297729,1297768,1297778,1297818,1297828,1297979,1297987,1298121,1298140,1298590,1298592,1298628-1298629,1298794,1298983-1298984,1299020
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-11

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

[markt]

Author: markt
Date: Fri Mar  9 20:34:55 2012
New Revision: 1299038

URL: http://svn.apache.org/viewvc?rev=1299038&view=rev
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1299038&r1=1299037&r2=1299038&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar  9 20:34:55 2012
@@ -154,6 +154,13 @@ PATCHES PROPOSED TO BACKPORT:
   +1: schultz
   -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52723
+  Correct theoretical resource leak in StandardManager
+  http://svn.apache.org/viewvc?rev=1299036&view=rev
+  +1: markt
+  -1:
+
+
 PATCHES/ISSUES THAT ARE STALLED
 
 * Backport JSP unloading patch (BZ48358).



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

DO NOT REPLY [Bug 52723] An incomplete fix for the resource leak bugs in StandardManager.java

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52723

Mark Thomas  changed:

   What|Removed |Added

 OS/Version||All
   Severity|critical|trivial

--- Comment #1 from Mark Thomas  2012-03-09 20:35:31 UTC ---
Severity set to something more realistic given the likelihood of this ever
actually happening.

Fixed in trunk and 7.0.x for 7.0.27. Proposed for 6.0.x although I'd be equally
happy with WONTFIX for 6.0.x.

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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2840

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1299017
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52837] NullPointerException at AprEndpoint.getCometPoller()

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52837

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Mark Thomas  2012-03-09 20:44:03 UTC ---
Bugzilla is not a support forum. The users mailing list is the please to seek
help and advice with this.

A quick look at the source code indicates that it must have been cometPollers
that was null. While the connector is running, there is no way for that to be
null unless there was a more serious error condition such as an OOME.

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

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2841

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1299020
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/2842

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1299034
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot

DO NOT REPLY [Bug 52850] Various miscellaneous fixes to Tomcat Memory Leak Detection code

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=52850

--- Comment #7 from Rohit Kelapure  2012-03-09 22:20:48 UTC 
---
(In reply to comment #5)

Thanks for accepting the patch

"I don't see any changes to address this. Did I miss them?"
Ensure that key and value types ALWAYS show up for all types of threadlocal
leaks (direct & indirect)
Method expungeStaleEntriesMethod =
tlmClass.getDeclaredMethod("expungeStaleEntries");
expungeStaleEntriesMethod.setAccessible(true);


I had to change WebappClassLoader.loadedByThisOrChild(Object)) to get the
Threadlocal leak test cases to pass.

I will be grateful if you add a check in the tests that confirms that the leak
warnings have showed up in the log. I did not add junit asserts for the
presence of log warnings. 

--Thanks


> (In reply to comment #0)
> > - Most of the detection and fixing code has been tested ONLY on Sun JVMs.
> Correct.
> 
> > - Tests in tomcat7.source\test\org\apache\catalina\loader do not seem to run
> > successfully and are incomplete for all the protection that Tomcat provides 
> > for
> > classloader memory leaks.
> The tests that are present do work. Yes, code coverage of the tests is a long
> way from 100%.
> 
> > - For some categories of threadlocal memory leaks the key and value are not
> > displayed correctly in the warning messages; particularly ones dealing with
> > indirect references to threadlocals
> I don't see any changes to address this. Did I miss them?
> 
> > -  org.apache.catalina.loader.WebappClassLoader.loadedByThisOrChild(Object)
> > incorrectly traverses the object classloader hierarchy instead of the 
> > current
> > (this) classloader hierarchy
> No. The test is not "loaded by this or parent", it is "loaded by this or 
> child"
> and is correct.
> 
> I haven't looked at the tests yet. I'll commit the fixes (less the change to
> WebappClassLoader.loadedByThisOrChild(Object)) with the tests once I have
> reviewed the new tests.

(In reply to comment #5)
> (In reply to comment #0)
> > - Most of the detection and fixing code has been tested ONLY on Sun JVMs.
> Correct.
> 
> > - Tests in tomcat7.source\test\org\apache\catalina\loader do not seem to run
> > successfully and are incomplete for all the protection that Tomcat provides 
> > for
> > classloader memory leaks.
> The tests that are present do work. Yes, code coverage of the tests is a long
> way from 100%.
> 
> > - For some categories of threadlocal memory leaks the key and value are not
> > displayed correctly in the warning messages; particularly ones dealing with
> > indirect references to threadlocals
> I don't see any changes to address this. Did I miss them?
> 
> > -  org.apache.catalina.loader.WebappClassLoader.loadedByThisOrChild(Object)
> > incorrectly traverses the object classloader hierarchy instead of the 
> > current
> > (this) classloader hierarchy
> No. The test is not "loaded by this or parent", it is "loaded by this or 
> child"
> and is correct.
> 
> I haven't looked at the tests yet. I'll commit the fixes (less the change to
> WebappClassLoader.loadedByThisOrChild(Object)) with the tests once I have
> reviewed the new tests.

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

[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed

[Bill Barker]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-tc7.0.x-test has an issue affecting its community integration.
This issue affects 1 projects.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-tc7.0.x-test :  Tomcat 7.x, a web server implementing Java Servlet 
3.0,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp-src.jar.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build failed
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-7.0.x/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html
Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 21 mins 7 secs
Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-10032012.jar 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-10032012-native-src.tar.gz
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-10032012-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-10032012.jar
 
-Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x 
-Dcommons-dbcp.home=/
 srv/gump/public/workspace/commons-dbcp-1.x 
-Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-10032012.jar
 test 
[Working Directory: /srv/gump/public/workspace/tomcat-7.0.x]
CLASSPATH: 
/usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp
 
ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7.
 
0.x/tomcat-deps/tomcat-dbcp-10032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-10032012.jar:/srv/gump/public/workspace/junit/dist/j

[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

[Gump]

To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 26 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency taglibs-standard-spec failed with reason build 
failed
 -INFO- Optional dependency httpunit failed with reason build failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 1 sec
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
at 
org.apache.maven.cli.compat.CompatibleMain.main(CompatibleMain.java:60)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
Caused by: org.apache.maven.project.ProjectBuildingException: Cannot find 
parent: org.apache.taglibs:taglibs-parent for project: 
null:taglibs-standard:pom:1.2-SNAPSHOT for project 
null:taglibs-standard:pom:1.2-SNAPSHOT
at 
org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1396)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.buildInternal(DefaultMavenProjectBuilder.java:823)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.buildFromSourceFileInternal(DefaultMavenProjectBuilder.java:508)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.build(DefaultMavenProjectBuilder.java:200)
at org.apache.maven.DefaultMaven.getProject(DefaultMaven.java:604)
at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:487)
at org.apache.maven.DefaultMaven.getProjects(DefaultMaven.java:391)
... 12 more
Caused by: org.apache.maven.project.ProjectBuildingException: POM 
'org.apache.taglibs:taglibs-parent' not found in repository: Unable to download 
the artifact from any repository

  org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT

from the specified remote repositories:
  gump-central (http://localhost:8192/maven2)

 for project org.apache.taglibs:taglibs-parent
at 
org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:605)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.assembleLineage(DefaultMavenProjectBuilder.java:1392)
... 18 more
Caused by: org.apache.maven.artifact.resolver.ArtifactNotFoundException: Unable 
to download the artifact from any repository

  org.apache.taglibs:taglibs-parent:pom:1-SNAPSHOT

from the specified remote repositories:
  gump-central (http://localhost:8192/maven2)


at 
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:228)
at 
org.apache.maven.artifact.resolver.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:90)
at 
org.apache.maven.project.DefaultMavenProjectBuilder.findModelFromRepository(DefaultMavenProjectBuilder.java:558)
... 19 more
Caused by: org.apache.maven.wagon.ResourceDoesNotExistException: Unable to 
download the artifact from any repository
at 
org.apache