svn commit: r1202570 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/
Author: kkolinko Date: Wed Nov 16 08:02:09 2011 New Revision: 1202570 URL: http://svn.apache.org/viewvc?rev=1202570&view=rev Log: Merged revision 1202565 from tomcat/trunk: Add "denyStatus" attribute to RequestFilterValve, RequestFilter. Add overridable denyRequest() method to RequestFilterValve. The denyStatus attribute is used to change HTTP status code that is used when rejecting denied request. E.g. to be 404 instead of default 403. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 08:02:09 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271 +/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,
svn commit: r1202576 - /tomcat/jk/trunk/native/common/jk_pool.c
Author: mturk
Date: Wed Nov 16 08:13:41 2011
New Revision: 1202576
URL: http://svn.apache.org/viewvc?rev=1202576&view=rev
Log:
Directly use dyn_alloc code in alloc function instead having separate function
Modified:
tomcat/jk/trunk/native/common/jk_pool.c
Modified: tomcat/jk/trunk/native/common/jk_pool.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_pool.c?rev=1202576&r1=1202575&r2=1202576&view=diff
==
--- tomcat/jk/trunk/native/common/jk_pool.c (original)
+++ tomcat/jk/trunk/native/common/jk_pool.c Wed Nov 16 08:13:41 2011
@@ -25,10 +25,6 @@
#define DEFAULT_DYNAMIC 10
-
-static void *jk_pool_dyn_alloc(jk_pool_t *p, size_t size);
-
-
void jk_open_pool(jk_pool_t *p, jk_pool_atom_t *buf, size_t size)
{
p->pos = 0;
@@ -67,15 +63,32 @@ void *jk_pool_alloc(jk_pool_t *p, size_t
{
void *rc = NULL;
+if (size == 0)
+return NULL;
size = JK_ALIGN_DEFAULT(size);
if ((p->size - p->pos) >= size) {
rc = &(p->buf[p->pos]);
p->pos += size;
}
else {
-rc = jk_pool_dyn_alloc(p, size);
-}
+if (p->dyn_size == p->dyn_pos) {
+size_t new_dyn_size = p->dyn_size * 2 + DEFAULT_DYNAMIC;
+void **new_dynamic = (void **)realloc(p->dynamic,
+new_dyn_size * sizeof(void *));
+if (new_dynamic) {
+p->dynamic = new_dynamic;
+p->dyn_size = new_dyn_size;
+}
+else {
+return NULL;
+}
+}
+rc = p->dynamic[p->dyn_pos] = malloc(size);
+if (p->dynamic[p->dyn_pos]) {
+p->dyn_pos++;
+}
+}
return rc;
}
@@ -169,33 +182,3 @@ char *jk_pool_strcatv(jk_pool_t *p, ...)
return rc;
}
-
-static void *jk_pool_dyn_alloc(jk_pool_t *p, size_t size)
-{
-void *rc;
-
-if (p->dyn_size == p->dyn_pos) {
-size_t new_dyn_size = p->dyn_size * 2 + DEFAULT_DYNAMIC;
-void **new_dynamic = (void **)malloc(new_dyn_size * sizeof(void *));
-if (new_dynamic) {
-if (p->dynamic) {
-/* Copy old dynamic slots */
-memcpy(new_dynamic, p->dynamic, p->dyn_size * sizeof(void *));
-free(p->dynamic);
-}
-
-p->dynamic = new_dynamic;
-p->dyn_size = new_dyn_size;
-}
-else {
-return NULL;
-}
-}
-
-rc = p->dynamic[p->dyn_pos] = malloc(size);
-if (p->dynamic[p->dyn_pos]) {
-p->dyn_pos++;
-}
-
-return rc;
-}
-
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
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/2521 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1202565 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
svn commit: r1202577 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Nov 16 08:18:49 2011 New Revision: 1202577 URL: http://svn.apache.org/viewvc?rev=1202577&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=1202577&r1=1202576&r2=1202577&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 16 08:18:49 2011 @@ -105,6 +105,14 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Add denyStatus attribute to RequestFilterValve + (RemoteAddrValve, RemoteHostValve valves). It allows to use different + HTTP response code when rejecting denied request. E.g. 404 instead of 403. + http://people.apache.org/~kkolinko/patches/2011-11-16_tc6_RequestFilterValve_denyStatus.patch + (r1202565 in trunk, r1202570 in TC7) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202578 - /tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
Author: kkolinko Date: Wed Nov 16 08:22:02 2011 New Revision: 1202578 URL: http://svn.apache.org/viewvc?rev=1202578&view=rev Log: Followup to r1202565 Correct description for one of valves. (Already done for the second one). Modified: tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Modified: tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1202578&r1=1202577&r2=1202578&view=diff == --- tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml (original) +++ tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Wed Nov 16 08:22:02 2011 @@ -337,7 +337,7 @@ type="java.lang.String"/>
svn commit: r1202579 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/mbeans-descriptors.xml
Author: kkolinko Date: Wed Nov 16 08:24:06 2011 New Revision: 1202579 URL: http://svn.apache.org/viewvc?rev=1202579&view=rev Log: Merged revision 1202578 from tomcat/trunk: Followup to r1202565 Correct description for one of valves. (Already done for the second one). Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 08:24:06 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565 +/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,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,1177
svn commit: r1202582 - /tomcat/jk/trunk/native/common/jk_ajp_common.c
Author: mturk
Date: Wed Nov 16 08:31:14 2011
New Revision: 1202582
URL: http://svn.apache.org/viewvc?rev=1202582&view=rev
Log:
Be more informative when logging message overflow
Modified:
tomcat/jk/trunk/native/common/jk_ajp_common.c
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1202582&r1=1202581&r2=1202582&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Nov 16 08:31:14 2011
@@ -432,7 +432,7 @@ static int ajp_marshal_into_msgb(jk_msg_
if ((sc = sc_for_req_header(s->headers_names[i])) != UNKNOWN_METHOD) {
if (jk_b_append_int(msg, (unsigned short)sc)) {
jk_log(l, JK_LOG_ERROR,
- "failed appending the header code");
+ "failed appending the header code for '%s'",
s->headers_names[i]);
JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -544,7 +544,8 @@ static int ajp_marshal_into_msgb(jk_msg_
if (jk_b_append_byte(msg, SC_A_SSL_KEY_SIZE) ||
jk_b_append_int(msg, (unsigned short)s->ssl_key_size)) {
jk_log(l, JK_LOG_ERROR,
- "failed appending the SSL key size");
+ "failed appending the SSL key size of length %d",
+ s->ssl_key_size);
JK_TRACE_EXIT(l);
return JK_FALSE;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202585 - in /tomcat/jk/trunk/native/common: jk_ajp14.c jk_ajp_common.c jk_msg_buff.c jk_msg_buff.h
Author: mturk
Date: Wed Nov 16 08:42:18 2011
New Revision: 1202585
URL: http://svn.apache.org/viewvc?rev=1202585&view=rev
Log:
No need for that many casts. Use simpler string api
Modified:
tomcat/jk/trunk/native/common/jk_ajp14.c
tomcat/jk/trunk/native/common/jk_ajp_common.c
tomcat/jk/trunk/native/common/jk_msg_buff.c
tomcat/jk/trunk/native/common/jk_msg_buff.h
Modified: tomcat/jk/trunk/native/common/jk_ajp14.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp14.c?rev=1202585&r1=1202584&r2=1202585&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp14.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp14.c Wed Nov 16 08:42:18 2011
@@ -185,7 +185,7 @@ int ajp14_unmarshal_log_ok(jk_msg_buf_t
return JK_FALSE;
}
-sname = (char *)jk_b_get_string(msg);
+sname = jk_b_get_string(msg);
if (!sname) {
jk_log(l, JK_LOG_ERROR,
@@ -414,7 +414,7 @@ int ajp14_unmarshal_context_info(jk_msg_
char *cname;
char *uri;
-vname = (char *)jk_b_get_string(msg);
+vname = jk_b_get_string(msg);
JK_TRACE_ENTER(l);
jk_log(l, JK_LOG_DEBUG,
@@ -442,7 +442,7 @@ int ajp14_unmarshal_context_info(jk_msg_
for (;;) {
-cname = (char *)jk_b_get_string(msg);
+cname = jk_b_get_string(msg);
if (!cname) {
jk_log(l, JK_LOG_ERROR,
@@ -471,7 +471,7 @@ int ajp14_unmarshal_context_info(jk_msg_
for (;;) {
-uri = (char *)jk_b_get_string(msg);
+uri = jk_b_get_string(msg);
if (!uri) {
jk_log(l, JK_LOG_ERROR,
@@ -620,7 +620,7 @@ int ajp14_unmarshal_context_state_reply(
JK_TRACE_ENTER(l);
/* get virtual name */
-vname = (char *)jk_b_get_string(msg);
+vname = jk_b_get_string(msg);
if (!vname) {
jk_log(l, JK_LOG_ERROR,
@@ -641,7 +641,7 @@ int ajp14_unmarshal_context_state_reply(
for (;;) {
/* get context name */
-cname = (char *)jk_b_get_string(msg);
+cname = jk_b_get_string(msg);
if (!cname) {
jk_log(l, JK_LOG_ERROR,
Modified: tomcat/jk/trunk/native/common/jk_ajp_common.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_ajp_common.c?rev=1202585&r1=1202584&r2=1202585&view=diff
==
--- tomcat/jk/trunk/native/common/jk_ajp_common.c (original)
+++ tomcat/jk/trunk/native/common/jk_ajp_common.c Wed Nov 16 08:42:18 2011
@@ -670,7 +670,7 @@ static int ajp_unmarshal_response(jk_msg
return JK_FALSE;
}
-d->msg = (char *)jk_b_get_string(msg);
+d->msg = jk_b_get_string(msg);
if (d->msg) {
#if (defined(AS400) && !defined(AS400_UTF8)) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d->msg, strlen(d->msg));
@@ -713,7 +713,7 @@ static int ajp_unmarshal_response(jk_msg
}
}
else {
-d->header_names[i] = (char *)jk_b_get_string(msg);
+d->header_names[i] = jk_b_get_string(msg);
if (!d->header_names[i]) {
jk_log(l, JK_LOG_ERROR,
"NULL header name");
@@ -727,7 +727,7 @@ static int ajp_unmarshal_response(jk_msg
}
-d->header_values[i] = (char *)jk_b_get_string(msg);
+d->header_values[i] = jk_b_get_string(msg);
if (!d->header_values[i]) {
jk_log(l, JK_LOG_ERROR,
"NULL header value");
Modified: tomcat/jk/trunk/native/common/jk_msg_buff.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_msg_buff.c?rev=1202585&r1=1202584&r2=1202585&view=diff
==
--- tomcat/jk/trunk/native/common/jk_msg_buff.c (original)
+++ tomcat/jk/trunk/native/common/jk_msg_buff.c Wed Nov 16 08:42:18 2011
@@ -131,7 +131,7 @@ int jk_b_set_buffer(jk_msg_buf_t *msg, u
int jk_b_set_buffer_size(jk_msg_buf_t *msg, int buffSize)
{
-unsigned char *data = (unsigned char *)jk_pool_alloc(msg->pool, buffSize);
+unsigned char *data = jk_pool_alloc(msg->pool, buffSize);
if (!data) {
return -1;
@@ -207,7 +207,7 @@ int jk_b_append_bytes(jk_msg_buf_t *msg,
}
/* We checked for space !! */
-memcpy((char *)msg->buf + msg->len, param, len);
+memcpy(msg->buf + msg->len, param, len);
msg->len += len;
return 0;
@@ -272,8 +272,7 @@ unsigned char jk_b_pget_byte(jk_msg_buf_
return msg->buf[pos];
}
-
-unsigned char *jk_b_get_string(jk_msg_buf_t *msg)
+char *jk_b_get_string(jk_msg_buf_t *msg)
{
unsigned short size = jk_b_get_int(msg);
int start = msg->pos;
@@ -288,7 +287,7 @@ unsigned char *jk_b_get_string(jk_msg_bu
msg->pos += size;
msg->pos++;
Re: svn commit: r1202556 - in /tomcat/jk/trunk/native: README.txt TODO.txt apache-2.0/bldjk.qclsrc apache-2.0/bldjk54.qclsrc build.xml netscape/Makefile.linux
2011/11/16 : > Author: mturk > Date: Wed Nov 16 07:07:10 2011 > New Revision: 1202556 > > URL: http://svn.apache.org/viewvc?rev=1202556&view=rev > Log: > Axe deprecated JNI references from more places > > Modified: > tomcat/jk/trunk/native/README.txt > tomcat/jk/trunk/native/TODO.txt > tomcat/jk/trunk/native/apache-2.0/bldjk.qclsrc > tomcat/jk/trunk/native/apache-2.0/bldjk54.qclsrc > tomcat/jk/trunk/native/build.xml > tomcat/jk/trunk/native/netscape/Makefile.linux Noticed one glitch in this, in Makefile.linux: > Modified: tomcat/jk/trunk/native/netscape/Makefile.linux > URL: > http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1202556&r1=1202555&r2=1202556&view=diff > == > --- tomcat/jk/trunk/native/netscape/Makefile.linux (original) > +++ tomcat/jk/trunk/native/netscape/Makefile.linux Wed Nov 16 07:07:10 2011 > @@ -37,8 +37,6 @@ VPATH=.:$(JK_DIR) > > JK_SRCS = $(shell \ls $(JK_DIR)/*.c) > JK_OBJECTS = $(patsubst $(JK_DIR)/%.c,%.o,$(JK_SRCS)) > -JK_OBJS = $(filter-out $(JK_JNI_OBJECTS),$(JK_OBJECTS)) > - > PLUGIN_OBJ = jk_nsapi_plugin.o > > INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDIR) -I$(INCLUDEDIR)/base \ > You axed the whole "JK_OBJS" above, but it is used below in the file: 48 nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ) 49 $(LD_SHAREDCMD) $(JK_OBJS) $(PLUGIN_OBJ) -o nsapi_redirector.so $(EXTRA_LDDEFINES) I do not 100% understand this file, but it looks like it can be replaced it with JK_OBJECTS. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.34
2011/11/15 jean-frederic clere : > The candidates binaries are available here: > http://people.apache.org/~jfclere/tomcat-6/v6.0.34/ > > According to the release process, the 6.0.34 build corresponding to the > tag TOMCAT_6_0_34 is: > [x] Broken http://localhost:8080/examples/servlets/servlet/RequestParamExample?firstname=hello+world Prints "hello+world" instead of "hello world". The cause is that UDecoder#convert() handles both '+' and '%xx' , but Parameters#processParameters(byte bytes[], ...) does not trigger decoding unless there is '%' in the value. E.g. "?firstname=hello+world%25" is decoded correctly. It is my fault as well that I missed this. Sorry for inconvenience. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202645 - /tomcat/jk/trunk/native/netscape/Makefile.linux
Author: mturk Date: Wed Nov 16 11:35:44 2011 New Revision: 1202645 URL: http://svn.apache.org/viewvc?rev=1202645&view=rev Log: Make sure we have correct variable after jni removal Modified: tomcat/jk/trunk/native/netscape/Makefile.linux Modified: tomcat/jk/trunk/native/netscape/Makefile.linux URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.linux?rev=1202645&r1=1202644&r2=1202645&view=diff == --- tomcat/jk/trunk/native/netscape/Makefile.linux (original) +++ tomcat/jk/trunk/native/netscape/Makefile.linux Wed Nov 16 11:35:44 2011 @@ -45,11 +45,11 @@ INCLUDE_FLAGS= -I$(JK_DIR) -I$(INCLUDEDI all: nsapi_redirector.so -nsapi_redirector.so: $(JK_OBJS) $(PLUGIN_OBJ) - $(LD_SHAREDCMD) $(JK_OBJS) $(PLUGIN_OBJ) -o nsapi_redirector.so $(EXTRA_LDDEFINES) +nsapi_redirector.so: $(JK_OBJECTS) $(PLUGIN_OBJ) + $(LD_SHAREDCMD) $(JK_OBJECTS) $(PLUGIN_OBJ) -o nsapi_redirector.so $(EXTRA_LDDEFINES) clean: - rm -f *.o nsapi_redirector.so $(JK_OBJS) + rm -f *.o nsapi_redirector.so $(JK_OBJECTS) %.o : %.c $(CC_CMD) $(INCLUDE_FLAGS) -c $< - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
URLDecoding not occurring for '+'
Hi,
With the HEAD revision of tc7.0.x/trunk I get that spaces are translated into +
symbols.
After binary searching which SVN rev in tomcat introduced this error, I found
the following:
- 1189876 correctly URL-decodes the + sign into a space
- 1189899 doesn't URL-decode the + sign into a space anymore, which results in
many + characters on the server
(and in our DB).
Looking into the SVN rev and looking into java.net.URL{Encoder,Decoder} I saw
that one case was left out in parsing parameters, so I tried the following
patch on the HEAD rev (r1202638):
Index: java/org/apache/tomcat/util/http/Parameters.java
===
--- java/org/apache/tomcat/util/http/Parameters.java(revision 1202638)
+++ java/org/apache/tomcat/util/http/Parameters.java(working copy)
@@ -284,6 +284,7 @@
pos++;
break;
case '%':
+case '+':
// Decoding required
if (parsingName) {
decodeName = true;
This solves my issue and the + signs are now correctly URL-decoded into spaces
again.
I hope this patch helps.
Best regards,
Willem
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1202556 - in /tomcat/jk/trunk/native: README.txt TODO.txt apache-2.0/bldjk.qclsrc apache-2.0/bldjk54.qclsrc build.xml netscape/Makefile.linux
On 11/16/2011 10:05 AM, Konstantin Kolinko wrote: 2011/11/16: I do not 100% understand this file, but it looks like it can be replaced it with JK_OBJECTS. Good catch. Fixed. Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51181] Add support for Web Sockets
https://issues.apache.org/bugzilla/show_bug.cgi?id=51181 --- Comment #19 from Suresh Karuppannan 2011-11-16 12:06:59 UTC --- +1, I'm looking into use it in our new product and I always prefer Tomcat. -- 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: URLDecoding not occurring for '+'
On 16.11.2011 12:41, Willem Fibbe wrote:
Hi,
With the HEAD revision of tc7.0.x/trunk I get that spaces are translated into +
symbols.
After binary searching which SVN rev in tomcat introduced this error, I found
the following:
- 1189876 correctly URL-decodes the + sign into a space
- 1189899 doesn't URL-decode the + sign into a space anymore, which results in
many + characters on the server
(and in our DB).
Looking into the SVN rev and looking into java.net.URL{Encoder,Decoder} I saw
that one case was left out in parsing parameters, so I tried the following
patch on the HEAD rev (r1202638):
Index: java/org/apache/tomcat/util/http/Parameters.java
===
--- java/org/apache/tomcat/util/http/Parameters.java(revision 1202638)
+++ java/org/apache/tomcat/util/http/Parameters.java(working copy)
@@ -284,6 +284,7 @@
pos++;
break;
case '%':
+case '+':
// Decoding required
if (parsingName) {
decodeName = true;
This solves my issue and the + signs are now correctly URL-decoded into spaces
again.
I hope this patch helps.
Thanks for posting your observation and analyzing the problem. We just
discovered the same 2 hours before your post while voting on 6.0.34,
which contains a similar patch.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202705 - in /tomcat/trunk: java/org/apache/tomcat/util/http/Parameters.java test/org/apache/tomcat/util/http/TestParameters.java
Author: kkolinko
Date: Wed Nov 16 13:43:53 2011
New Revision: 1202705
URL: http://svn.apache.org/viewvc?rev=1202705&view=rev
Log:
Parameters.java:
- Fix regression in urldecoding of parameters that contain spaces
Patch by Willem Fibbe
TestParameters.java:
- Improve the test to cover parameters that contain spaces
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1202705&r1=1202704&r2=1202705&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Wed Nov 16
13:43:53 2011
@@ -266,6 +266,7 @@ public final class Parameters {
pos++;
break;
case '%':
+case '+':
// Decoding required
if (parsingName) {
decodeName = true;
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1202705&r1=1202704&r2=1202705&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/TestParameters.java Wed Nov
16 13:43:53 2011
@@ -16,6 +16,8 @@
*/
package org.apache.tomcat.util.http;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.util.Enumeration;
import static org.junit.Assert.assertArrayEquals;
@@ -24,16 +26,15 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-import org.apache.tomcat.util.buf.UEncoder;
+import org.junit.Test;
public class TestParameters {
private static final Parameter SIMPLE =
new Parameter("foo1", "bar1");
private static final Parameter SIMPLE_MULTIPLE =
-new Parameter("foo2", "bar1", "bar2");
+new Parameter("foo2", "bar1", "bar2", "hello world", "?%@");
private static final Parameter NO_VALUE =
new Parameter("foo3");
private static final Parameter EMPTY_VALUE =
@@ -78,7 +79,10 @@ public class TestParameters {
@Test
public void testInternal() {
assertEquals("foo1=bar1", SIMPLE.toString());
-assertEquals("foo2=bar1&foo2=bar2", SIMPLE_MULTIPLE.toString());
+// Note: testing requires that ' ' is encoded as '+',
+// because that is what browsers will send us.
+assertEquals("foo2=bar1&foo2=bar2&foo2=hello+world&foo2=%3F%25%40",
+SIMPLE_MULTIPLE.toString());
assertEquals("foo3", NO_VALUE.toString());
assertEquals("foo4=", EMPTY_VALUE.toString());
}
@@ -274,7 +278,6 @@ public class TestParameters {
private static class Parameter {
private final String name;
private final String[] values;
-private final UEncoder uencoder = new UEncoder();
public Parameter(String name, String... values) {
this.name = name;
@@ -291,27 +294,30 @@ public class TestParameters {
@Override
public String toString() {
-StringBuilder result = new StringBuilder();
-boolean first = true;
-if (values.length == 0) {
-return uencoder.encodeURL(name);
-}
-for (String value : values) {
-if (first) {
-first = false;
-} else {
-result.append('&');
+try {
+StringBuilder result = new StringBuilder();
+boolean first = true;
+if (values.length == 0) {
+return URLEncoder.encode(name, "UTF-8");
}
-if (name != null) {
-result.append(uencoder.encodeURL(name));
-}
-if (value != null) {
-result.append('=');
-result.append(uencoder.encodeURL(value));
+for (String value : values) {
+if (first) {
+first = false;
+} else {
+result.append('&');
+}
+if (name != null) {
+result.append(URLEncoder.encode(name, "UTF-8"));
+}
+if (value != null) {
+result.append('=');
+
svn commit: r1202708 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/Parameters.java test/org/apache/tomcat/util/http/TestParameters.java
Author: kkolinko Date: Wed Nov 16 13:47:29 2011 New Revision: 1202708 URL: http://svn.apache.org/viewvc?rev=1202708&view=rev Log: Merged revision 1202705 from tomcat/trunk: Parameters.java: - Fix regression in urldecoding of parameters that contain spaces Patch by Willem Fibbe TestParameters.java: - Improve the test to cover parameters that contain spaces Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 13:47:29 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565,1202578 +/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,1174983,1175155,1175158,1175167,1175182,1
svn commit: r1202711 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Nov 16 13:51:31 2011 New Revision: 1202711 URL: http://svn.apache.org/viewvc?rev=1202711&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=1202711&r1=1202710&r2=1202711&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 16 13:51:31 2011 @@ -113,6 +113,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko -1: +* Fix regression in urldecoding of parameters that contain spaces + http://svn.apache.org/viewvc?rev=1202705&view=rev + (Parameters.java only) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202712 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Nov 16 13:53:54 2011 New Revision: 1202712 URL: http://svn.apache.org/viewvc?rev=1202712&view=rev Log: update proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1202712&r1=1202711&r2=1202712&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Nov 16 13:53:54 2011 @@ -66,6 +66,7 @@ PATCHES PROPOSED TO BACKPORT: if there were errors during HTTP parameter parsing. (kkolinko) http://people.apache.org/~kkolinko/patches/2011-11-12_tc55_parameters-v4.patch + + http://svn.apache.org/viewvc?rev=1202705&view=rev (Parameters.java only) Before the patch: Should be created by patch tool automatically, but just to be sure: mkdir container/catalina/src/share/org/apache/catalina/filters - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202748 - /tomcat/jk/trunk/native/common/jk_shm.c
Author: mturk Date: Wed Nov 16 15:47:09 2011 New Revision: 1202748 URL: http://svn.apache.org/viewvc?rev=1202748&view=rev Log: Clean few extra unlonck macros with now extra retval Modified: tomcat/jk/trunk/native/common/jk_shm.c Modified: tomcat/jk/trunk/native/common/jk_shm.c URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_shm.c?rev=1202748&r1=1202747&r2=1202748&view=diff == --- tomcat/jk/trunk/native/common/jk_shm.c (original) +++ tomcat/jk/trunk/native/common/jk_shm.c Wed Nov 16 15:47:09 2011 @@ -206,7 +206,7 @@ int jk_shm_open(const char *fname, size_ CloseHandle(jk_shm_hlock); jk_shm_hlock = NULL; jk_shm_map = NULL; -JK_LEAVE_CS(&jk_shmem.cs, rc); +JK_LEAVE_CS(&jk_shmem.cs); JK_TRACE_EXIT(l); return -1; } @@ -230,7 +230,7 @@ int jk_shm_open(const char *fname, size_ jk_shm_hlock = NULL; } #endif -JK_LEAVE_CS(&jk_shmem.cs, rc); +JK_LEAVE_CS(&jk_shmem.cs); JK_TRACE_EXIT(l); return -1; } @@ -271,7 +271,7 @@ int jk_shm_open(const char *fname, size_ /* Unlock shared memory */ ReleaseMutex(jk_shm_hlock); } -JK_LEAVE_CS(&jk_shmem.cs, rc); +JK_LEAVE_CS(&jk_shmem.cs); if (JK_IS_DEBUG_LEVEL(l)) jk_log(l, JK_LOG_DEBUG, "%s shared memory %s size=%u free=%u addr=%#lx", - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202761 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Nov 16 16:10:56 2011 New Revision: 1202761 URL: http://svn.apache.org/viewvc?rev=1202761&view=rev Log: Vote. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1202761&r1=1202760&r2=1202761&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 16 16:10:56 2011 @@ -116,7 +116,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix regression in urldecoding of parameters that contain spaces http://svn.apache.org/viewvc?rev=1202705&view=rev (Parameters.java only) - +1: kkolinko + +1: kkolinko, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
tomcat7-maven-plugin extraDependency not working with class not found
-
Key: MTOMCAT-106
URL: https://issues.apache.org/jira/browse/MTOMCAT-106
Project: Apache Tomcat Maven Plugin
Issue Type: Bug
Components: tomcat7
Affects Versions: 2.0
Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
Reporter: William Ghelfi
Assignee: Olivier Lamy
Hello,
I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
tomcat7-maven-plugin, taken from
http://people.apache.org/repo/m2-snapshot-repository
Needing derby, I would use the extraDependencies configuration element as
showed in the second example at:
http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
Here's my configuration:
org.apache.tomcat.maven
tomcat7-maven-plugin
2.0-SNAPSHOT
tomcat-run
exec-war-only
package
/${project.artifactId}
true
org.apache.derby
derby
10.8.2.2
So I launch "mvn clean package -e" and get:
org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
created DOM for plugin configuration
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
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:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
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.plugin.PluginConfigurationException: Error
configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
parse the created DOM for plugin configuration
at
org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
at
org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
at
org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
... 17 more
Caused by:
org.codehaus.plexus.component.configurator.ComponentConfigurationException:
Error loading class 'org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency'
at
org.codehaus.plexus.component.configurator.converters.composite.CollectionConverter.fromConfiguration(CollectionConverter.java:170)
at
org.codehaus.plexus.component.configurator.converters.ComponentValueSetter.configure(ComponentValueSetter.java:247)
at
org.codehaus.plexus.component.configurator.converters.composite.ObjectWithFieldsConverter.processConfiguration(ObjectWithFieldsConverter.java:137)
at
org.codehaus.plexus.component.configurator.BasicComponentConfigurator.configureComponent(BasicC
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151313#comment-13151313
]
Olivier Lamy commented on MTOMCAT-106:
--
please attach a patch file and check "Grant license to ASF for inclusion in ASF
works (as per the Apache License §5)"
Thanks!
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error loading class
> 'org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency'
> a
[jira] [Updated] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
William Ghelfi updated MTOMCAT-106:
---
Attachment: 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
For a prettified preview, go to:
https://github.com/apache/tomcat-maven-plugin/pull/1/files
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error l
[jira] [Issue Comment Edited] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151357#comment-13151357
]
William Ghelfi edited comment on MTOMCAT-106 at 11/16/11 5:34 PM:
--
Just attached a patch :)
For a prettified preview, go to:
https://github.com/apache/tomcat-maven-plugin/pull/1/files
was (Author: trumbitta):
For a prettified preview, go to:
https://github.com/apache/tomcat-maven-plugin/pull/1/files
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.life
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151378#comment-13151378
]
Olivier Lamy commented on MTOMCAT-106:
--
to prevent too much complicated xml configuration.
I would prefer : ExtraDependency extend Dependency
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error loading class
> 'org
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151396#comment-13151396
]
William Ghelfi commented on MTOMCAT-106:
Me too!
But due to my (great) lack of skills as a Java programmer, I was unable to
obtain the desired set of classes... so I just sticked with what I found for
warDependencies and hacked the code with a bit of copy & paste & rename
Maybe you can properly refactor the patch?
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGo
DO NOT REPLY [Bug 52184] Reduce log level for invalid cookies
https://issues.apache.org/bugzilla/show_bug.cgi?id=52184 Mark Thomas changed: What|Removed |Added OS/Version||All --- Comment #1 from Mark Thomas 2011-11-16 18:29:26 UTC --- I'm against this change. Dropping a cookie needs to logged by default. If an application is generating a lot of invalid cookies then the log level can always be increased to WARN for that logger. Arguably the log level for dropping a cookie should be WARN anyway. It has already been dropped to INFO due to the frequency that it is observed and to allow the messages to be filtered out by setting the log level to WARN. -- 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: r1202828 - /tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt
Date: Wed Nov 16 18:39:07 2011
New Revision: 1202828
URL: http://svn.apache.org/viewvc?rev=1202828&view=rev
Log:
Increase time between PINGs in an attempt to reduce false test failures
Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1202828&r1=1202827&r2=1202828&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Wed Nov
16 18:39:07 2011
@@ -394,7 +394,7 @@ public class TestCometProcessor extends
os.write("4\r\n".getBytes());
os.write("PING\r\n".getBytes());
os.flush();
-Thread.sleep(1000);
+Thread.sleep(2000);
}
os.write("0\r\n".getBytes());
os.write("\r\n".getBytes());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202832 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt Date: Wed Nov 16 18:45:42 2011 New Revision: 1202832 URL: http://svn.apache.org/viewvc?rev=1202832&view=rev Log: Increase time between PINGs in an attempt to reduce false test failures Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 18:45:42 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565,1202578,1202705 +/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,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,1
buildbot failure in ASF Buildbot on tomcat-trunk
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/2524 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1202828 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1202860 - /tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt
Date: Wed Nov 16 19:51:14 2011
New Revision: 1202860
URL: http://svn.apache.org/viewvc?rev=1202860&view=rev
Log:
Adjust timing limits for new PING delay
Modified:
tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Modified: tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1202860&r1=1202859&r2=1202860&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Wed Nov
16 19:51:14 2011
@@ -212,14 +212,14 @@ public class TestCometProcessor extends
assertEquals(26, response.length);
} else {
// Failure expected only expected for the fail on begin
-// Failure at any later stage and the reponse headers (including
the
-// 200 response code will already have been sent to the client
+// Failure at any later stage and the response headers (including
+// the 200 response code will already have been sent to the client
if (SimpleCometServlet.FAIL_ON_BEGIN.equals(initParam)) {
assertEquals("HTTP/1.1 500 Internal Server Error",
response[0]);
alv.validateAccessLog(1, 500, 0, 1000);
} else {
assertEquals("HTTP/1.1 200 OK", response[0]);
-alv.validateAccessLog(1, 200, 0, 5000);
+alv.validateAccessLog(1, 200, 0, 9000);
}
}
@@ -394,7 +394,7 @@ public class TestCometProcessor extends
os.write("4\r\n".getBytes());
os.write("PING\r\n".getBytes());
os.flush();
-Thread.sleep(2000);
+Thread.sleep(1000);
}
os.write("0\r\n".getBytes());
os.write("\r\n".getBytes());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1202864 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/comet/TestCometProcessor.java
Author: markt Date: Wed Nov 16 19:56:08 2011 New Revision: 1202864 URL: http://svn.apache.org/viewvc?rev=1202864&view=rev Log: Adjust timing limits for new PING delay Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Nov 16 19:56:08 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565,1202578,1202705,1202828 +/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,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,1
buildbot success in ASF Buildbot on tomcat-trunk
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/2525 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1202860 Blamelist: markt Build succeeded! sincerely, -The Buildbot
question on IP for VirtualContext
Hello, To fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 (Eclipse WTP "Serve modules without publishing" broken with tc7), I'd like to enhance the existing org.apache.naming.resources.VirtualDirContext with some features very much like in org.eclipse.jst.server.tomcat.loader.WtpDirContext ( you can find the source in http://dev.eclipse.org/viewcvs/viewvc.cgi/servertools/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip?view=co&revision=1.5&root=WebTools_Project ) Tomcat's VirtualDirContext is already very close to Eclipse WtpDirContect, both of them have @author Fabrizio Giustina in their javadocs... How far am I allowed to borrow features from WtpDirContext back in VirtualDirContext ? how can I make this right for all the Intellectual Property and licenses point of view? Thanks for your help, Sylvain
Re: question on IP for VirtualContext
On 16/11/2011 20:31, Sylvain Laurent wrote: > Hello, > > To fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 > (Eclipse WTP "Serve modules without publishing" broken with tc7), I'd > like to enhance the existing > org.apache.naming.resources.VirtualDirContext with some features very > much like in org.eclipse.jst.server.tomcat.loader.WtpDirContext ( you > can find the source in > http://dev.eclipse.org/viewcvs/viewvc.cgi/servertools/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip?view=co&revision=1.5&root=WebTools_Project > ) How is that code licensed? Mark > > Tomcat's VirtualDirContext is already very close to Eclipse > WtpDirContect, both of them have @author Fabrizio Giustina in their > javadocs... How far am I allowed to borrow features from > WtpDirContext back in VirtualDirContext ? how can I make this right > for all the Intellectual Property and licenses point of view? > > Thanks for your help, Sylvain - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: question on IP for VirtualContext
On 16 nov. 2011, at 21:34, Mark Thomas wrote: > On 16/11/2011 20:31, Sylvain Laurent wrote: >> Hello, >> >> To fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 >> (Eclipse WTP "Serve modules without publishing" broken with tc7), I'd >> like to enhance the existing >> org.apache.naming.resources.VirtualDirContext with some features very >> much like in org.eclipse.jst.server.tomcat.loader.WtpDirContext ( you >> can find the source in >> http://dev.eclipse.org/viewcvs/viewvc.cgi/servertools/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip?view=co&revision=1.5&root=WebTools_Project >> ) > > How is that code licensed? EPL : /** * Copyright (c) 2010, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: *Igor Fedorenko & Fabrizio Giustina - Initial API and implementation **/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: question on IP for VirtualContext
On 16/11/2011 20:38, Sylvain Laurent wrote: > > On 16 nov. 2011, at 21:34, Mark Thomas wrote: > >> On 16/11/2011 20:31, Sylvain Laurent wrote: >>> Hello, >>> >>> To fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 >>> (Eclipse WTP "Serve modules without publishing" broken with tc7), I'd >>> like to enhance the existing >>> org.apache.naming.resources.VirtualDirContext with some features very >>> much like in org.eclipse.jst.server.tomcat.loader.WtpDirContext ( you >>> can find the source in >>> http://dev.eclipse.org/viewcvs/viewvc.cgi/servertools/plugins/org.eclipse.jst.server.tomcat.core/org.eclipse.jst.server.tomcat.runtime.70.loader-src.zip?view=co&revision=1.5&root=WebTools_Project >>> ) >> >> How is that code licensed? > > EPL : Then you can't use it in source form unless the original authors re-license under an appropriate license - ideally ALv2. Mark > > /** > * Copyright (c) 2010, 2011 IBM Corporation and others. > * All rights reserved. This program and the accompanying materials > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html > * > * Contributors: > *Igor Fedorenko & Fabrizio Giustina - Initial API and implementation > **/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52191] SHM file name for ISAPI Redirector is not unique when multiple ISAPI Redirectors on Website
https://issues.apache.org/bugzilla/show_bug.cgi?id=52191 --- Comment #1 from Tim Whittington 2011-11-16 21:11:54 UTC --- Created attachment 27960 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27960 Make shm filename unique based on extension_uri Attached a patch for option 1, using the extension_uri to unique the filename. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1158991 - in /tomcat/jk/trunk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
OK, finally getting time to have another look at this... https://issues.apache.org/bugzilla/show_bug.cgi?id=52191 summarises the situation - basically the SHM filename used now is not unique enough when there are multiple ISAPI Redirectors on a single website. My current proposal is to use the extension_uri to distinguish between the configurations (on the assumption that this will be the same on every site in a web server farm). cheers tim On Thu, Aug 18, 2011 at 8:08 PM, Tim Whittington wrote: > Yeah - not sure what I was smoking on that one. > Have reverted for another think. > > The basic problem we have is that the shared memory code assumes a > single worker configuration, and when you have multiple ISAPI > Redirectors on a single IIS with different configs that goes a bit > wonky. For a start, the SHM size is calculated by the first redirector > to start (and so may be too small for the other one), and then there's > the issue of the workers in the SHM not aligning. > > A possible solution might be a shm_config_name property that > distinguishes one redirector config from another (that should be > consistent across all processes). > The redirector DLL path could be used instead if that was reliable - I > don't know enough about IIS clusters to know if they span multiple > machines. > > If anyone's got any other ideas I'd be interested. > > cheers > tim > > On Thu, Aug 18, 2011 at 4:40 PM, Mladen Turk wrote: >> On 08/18/2011 03:54 AM, t...@apache.org wrote: >>> >>> Author: timw >>> Date: Thu Aug 18 01:54:31 2011 >>> New Revision: 1158991 >>> >>> URL: http://svn.apache.org/viewvc?rev=1158991&view=rev >>> Log: >>> Use the DLL handle to make the shared memory file name used by the ISAPI >>> Redirector unique for each DLL - the redirector supports multiple instances >>> per website, and without this multiple redirectors could access the same >>> shared memory file, corrupting the contents (evident when LB workers are >>> used on IIS 7). >>> >> >> >> Hmm, isn't that actually disabling the shared memory purpose? >> There is no point to have shared memory if it can't be shared >> across the processes. >> >> Your change makes no sense to me, cause now the shared memory >> is unique to each worker process which can be easily solved by >> not using the shared memory at all. >> >> IMHO if IIS7 corrupts the shared memory, we should find a way >> to better synchronize the access to it from multiple >> processes instead just making it unique to each process. >> >> >> Regards >> -- >> ^TM >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> >> > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "PoweredBy" by MattFogel
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by MattFogel:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=382&rev2=383
Comment:
Adding Agendize to list
=== AccesStream ===
{{http://www.accesstream.com/templates/accesstream/images/accesstream_header_logo.gif}}
[[http://www.accesstream.com|AccesStream]] is an open-source Identity and
Access Management suite.
+ === Agendize ===
+
+ {{http://www.agendize.com/shared/img/agendize.gif}}
[[http://www.agendize.com|Agendize]] is a platform that offers conversion &
communication tools such as Click to Call, Live Chat and Online Appointment
Booking that can easily be added to any website. Agendize has powered over
20,000,000 customer interactions and the application runs on Tomcat.
+
=== agileBase ===
{{http://agilebase.co.uk/logo-agilebase.png}}
[[http://www.agilebase.co.uk|agileBase]] is an open source, commercially
hosted/supported platform for building lean, agile business software.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1198553 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml webapps/do
On 06/11/2011 20:52, kkoli...@apache.org wrote: > Author: kkolinko > Date: Sun Nov 6 20:52:33 2011 > New Revision: 1198553 > > URL: http://svn.apache.org/viewvc?rev=1198553&view=rev > Log: > Merged revisions r1197158, r1198552 from tomcat/trunk: > Add new attribute to AbstractEndpoint and use it to speed up Tomcat tests. > If the attribute "fastShutdown" is set on the endpoint, > the usual wait of 1 sec during pause() is skipped. I'm seeing unit test failures (with a JVM crash) on 64-bit Ubuntu Linux with this patch that go away if I disable the fast shut-down. I only have a single result that shows this. I need to do multiple tests to confirm the result. I'm not too bothered right now since this won't affect production systems but I'd like to get to the bottom of it. Any thoughts welcome. In the meantime I am running the TCKs against 7.0.x trunk and if the pass (the unit tests all do) then I'll tag 7.0.23 some time tomorrow. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151588#comment-13151588
]
Olivier Lamy commented on MTOMCAT-106:
--
you are using mvn 2.x ?
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error loading class
> 'org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency'
> at
> org.cod
[Tomcat Wiki] Update of "PoweredBy" by MattFogel
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "PoweredBy" page has been changed by MattFogel:
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=383&rev2=384
Comment:
Adding some links for more info
=== Agendize ===
- {{http://www.agendize.com/shared/img/agendize.gif}}
[[http://www.agendize.com|Agendize]] is a platform that offers conversion &
communication tools such as Click to Call, Live Chat and Online Appointment
Booking that can easily be added to any website. Agendize has powered over
20,000,000 customer interactions and the application runs on Tomcat.
+ {{http://www.agendize.com/shared/img/agendize.gif}}
[[http://www.agendize.com|Agendize]] is a platform that offers conversion &
communication tools such as [[http://www.agendize.com/toolbox/call|Click to
Call]], [[http://www.agendize.com/toolbox/chat|Live Chat]] and
[[http://www.agendize.com/toolbox/scheduling|Online Appointment Booking]] that
can easily be added to any website. Agendize has powered over 20,000,000
customer interactions and the application runs on Tomcat.
=== agileBase ===
{{http://agilebase.co.uk/logo-agilebase.png}}
[[http://www.agilebase.co.uk|agileBase]] is an open source, commercially
hosted/supported platform for building lean, agile business software.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151599#comment-13151599
]
William Ghelfi commented on MTOMCAT-106:
Yep, 2.2.1
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error loading class
> 'org.apache.tomcat.maven.plugin.tomcat7.run.ExtraDependency'
> at
> org.codehaus.ple
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151608#comment-13151608
]
Olivier Lamy commented on MTOMCAT-106:
--
ok. fyi You won't have this issue with 3.x
BTW I have to fix that ;-)
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:468)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694)
> ... 17 more
> Caused by:
> org.codehaus.plexus.component.configurator.ComponentConfigurationException:
> Error loading class
> 'org.apache.tomcat.maven.plugin.tomc
[jira] [Commented] (MTOMCAT-106) tomcat7-maven-plugin extraDependency not working with class not found
[
https://issues.apache.org/jira/browse/MTOMCAT-106?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13151628#comment-13151628
]
William Ghelfi commented on MTOMCAT-106:
Thank you :)
At the moment I have to keep the software I'm co-working on, at version 2.2.1
because it's quite complex and many components and features need to be
re-thinked before we can upgrade to mvn 3.
We will approach mvn 3 during 2012 for sure, but for the next release we really
look forward for your fix :)
Thank you again for your great work and quick response
> tomcat7-maven-plugin extraDependency not working with class not found
> -
>
> Key: MTOMCAT-106
> URL: https://issues.apache.org/jira/browse/MTOMCAT-106
> Project: Apache Tomcat Maven Plugin
> Issue Type: Bug
> Components: tomcat7
>Affects Versions: 2.0
> Environment: Ubuntu 11.04 @32bit with Maven 2.2.1 and Java 1.6.0_26
>Reporter: William Ghelfi
>Assignee: Olivier Lamy
> Labels: maven, snapshot, tomcat
> Attachments:
> 0001-extraDependencies-didn-t-really-work-exiting-with-er.patch
>
>
> Hello,
> I'm trying to use the 'exec-war-only' goal from version 2.0-SNAPSHOT of
> tomcat7-maven-plugin, taken from
> http://people.apache.org/repo/m2-snapshot-repository
> Needing derby, I would use the extraDependencies configuration element as
> showed in the second example at:
> http://tomcat.apache.org/maven-plugin-2.0-SNAPSHOT/executable-war-jar.html
> Here's my configuration:
>
> org.apache.tomcat.maven
> tomcat7-maven-plugin
> 2.0-SNAPSHOT
>
>
> tomcat-run
>
> exec-war-only
>
> package
>
> /${project.artifactId}
> true
>
>
>
> org.apache.derby
>
> derby
>
> 10.8.2.2
>
>
>
>
>
>
> So I launch "mvn clean package -e" and get:
> org.apache.maven.lifecycle.LifecycleExecutionException: Error configuring:
> org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to parse the
> created DOM for plugin configuration
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:723)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:535)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:387)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:348)
> at
> org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:180)
> at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:328)
> at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:138)
> at org.apache.maven.cli.MavenCli.main(MavenCli.java:362)
> 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:39)
> at
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
> at java.lang.reflect.Method.invoke(Method.java:597)
> 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.plugin.PluginConfigurationException: Error
> configuring: org.apache.tomcat.maven:tomcat7-maven-plugin. Reason: Unable to
> parse the created DOM for plugin configuration
> at
> org.apache.maven.plugin.DefaultPluginManager.populatePluginFields(DefaultPluginManager.java:1363)
> at
> org.apache.maven.plugin.DefaultPluginManager.getConfiguredMojo(DefaultPluginManager.java:724)
> at
> org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPlug
Change in behavior for Connector maxKeepAliveRequests in 7.0.21+
Hey everyone, As part of the HTTP connector refactoring that occurred in 7.0.21 (see http://svn.apache.org/viewvc?diff_format=h&view=revision&revision=1158367) the Connector behavior has changed when maxKeepAliveRequests is set to 0. In Tomcat 7.0.20 and earlier, a setting of 0 would disable keepalives for the connector. In 7.0.21 an up, it's enabled and from what I can tell, set to infinite. Was this change intended? From looking at the documentation, the updated code is correct as a value of 0 is not mentioned. However, this could cause issues for servers that have maxKeepAliveRequests mis-configured to 0 and upgrade to 7.0.21+ Thoughts? -Ryan - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1198553 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml webapps/do
2011/11/17 Mark Thomas : > On 06/11/2011 20:52, kkoli...@apache.org wrote: >> Author: kkolinko >> Date: Sun Nov 6 20:52:33 2011 >> New Revision: 1198553 >> >> URL: http://svn.apache.org/viewvc?rev=1198553&view=rev >> Log: >> Merged revisions r1197158, r1198552 from tomcat/trunk: >> Add new attribute to AbstractEndpoint and use it to speed up Tomcat tests. >> If the attribute "fastShutdown" is set on the endpoint, >> the usual wait of 1 sec during pause() is skipped. > > I'm seeing unit test failures (with a JVM crash) on 64-bit Ubuntu Linux > with this patch that go away if I disable the fast shut-down. I only > have a single result that shows this. I need to do multiple tests to > confirm the result. > What connector that is? Rainer wrote about APR/TCnative 1.1.22 with APR 1.4.5. Java VM: Java HotSpot(TM) Server VM (20.4-b02 mixed mode solaris-sparc ): http://tomcat.markmail.org/thread/a5quoui2soe6qb33 There is also a user report that sounds as reproducible, though may not be related to this specific issue: https://issues.apache.org/bugzilla/show_bug.cgi?id=52153 "periodic JVM crash (access violation) on buffer flush" > I'm not too bothered right now since this won't affect production > systems but I'd like to get to the bottom of it. > > Any thoughts welcome. > Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203047 - in /tomcat/trunk/java/org/apache/tomcat/util: buf/UDecoder.java http/Parameters.java
Author: kkolinko
Date: Thu Nov 17 04:50:41 2011
New Revision: 1203047
URL: http://svn.apache.org/viewvc?rev=1203047&view=rev
Log:
Rearrange code. No functional change.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203047&r1=1203046&r2=1203047&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
04:50:41 2011
@@ -64,10 +64,7 @@ public final class UDecoder {
}
// idx will be the smallest positive indexes ( first % or + )
-if( idx2 >= 0 && idx2 < idx ) {
-idx=idx2;
-}
-if( idx < 0 ) {
+if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
@@ -134,10 +131,7 @@ public final class UDecoder {
return;
}
-if( idx2 >= 0 && idx2 < idx ) {
-idx=idx2;
-}
-if( idx < 0 ) {
+if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1203047&r1=1203046&r2=1203047&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Thu Nov 17
04:50:41 2011
@@ -392,7 +392,7 @@ public final class Parameters {
if( urlDec==null ) {
urlDec=new UDecoder();
}
-urlDec.convert(bc);
+urlDec.convert(bc, true);
}
public void processParameters( MessageBytes data, String encoding ) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203049 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: kkolinko
Date: Thu Nov 17 05:05:17 2011
New Revision: 1203049
URL: http://svn.apache.org/viewvc?rev=1203049&view=rev
Log:
Small optimization.
Use findByte() instead of indexOf(). Implementation is the same, but it is more
fair to its arguments.
Limit second string scan using results from the first one.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203049&r1=1203048&r2=1203049&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
05:05:17 2011
@@ -54,10 +54,10 @@ public final class UDecoder {
byte buff[]=mb.getBytes();
int end=mb.getEnd();
-int idx= ByteChunk.indexOf( buff, start, end, '%' );
+int idx= ByteChunk.findByte( buff, start, end, (byte) '%' );
int idx2=-1;
if( query ) {
-idx2= ByteChunk.indexOf( buff, start, end, '+' );
+idx2= ByteChunk.findByte( buff, start, (idx >= 0 ? idx : end),
(byte) '+' );
}
if( idx<0 && idx2<0 ) {
return;
@@ -125,7 +125,7 @@ public final class UDecoder {
int idx= CharChunk.indexOf( buff, start, cend, '%' );
int idx2=-1;
if( query ) {
-idx2= CharChunk.indexOf( buff, start, cend, '+' );
+idx2= CharChunk.indexOf( buff, start, (idx >= 0 ? idx : cend), '+'
);
}
if( idx<0 && idx2<0 ) {
return;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203052 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: kkolinko
Date: Thu Nov 17 05:21:04 2011
New Revision: 1203052
URL: http://svn.apache.org/viewvc?rev=1203052&view=rev
Log:
Reduce overhead from exception handling, using
ProxyDirContext.NOT_FOUND_EXCEPTION as an example.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203052&r1=1203051&r2=1203052&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
05:21:04 2011
@@ -32,6 +32,30 @@ public final class UDecoder {
protected static final boolean ALLOW_ENCODED_SLASH =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
"false")).booleanValue();
+private static class DecodeException extends CharConversionException {
+private static final long serialVersionUID = 1L;
+public DecodeException(String s) {
+super(s);
+}
+
+@Override
+public synchronized Throwable fillInStackTrace() {
+// This class does not provide a stack trace
+return this;
+}
+}
+
+/** Unexpected end of data. */
+private static final IOException EXCEPTION_EOF = new
DecodeException("EOF");
+
+/** %xx with not-hex digit */
+private static final IOException EXCEPTION_NOT_HEX_DIGIT = new
DecodeException(
+"isHexDigit");
+
+/** %-encoded slash is forbidden in resource path */
+private static final IOException EXCEPTION_SLASH = new DecodeException(
+"noSlash");
+
public UDecoder()
{
}
@@ -78,18 +102,18 @@ public final class UDecoder {
} else {
// read next 2 digits
if( j+2 >= end ) {
-throw new CharConversionException("EOF");
+throw EXCEPTION_EOF;
}
byte b1= buff[j+1];
byte b2=buff[j+2];
if( !isHexDigit( b1 ) || ! isHexDigit(b2 )) {
-throw new CharConversionException( "isHexDigit");
+throw EXCEPTION_NOT_HEX_DIGIT;
}
j+=2;
int res=x2c( b1, b2 );
if (noSlash && (res == '/')) {
-throw new CharConversionException( "noSlash");
+throw EXCEPTION_SLASH;
}
buff[idx]=(byte)res;
}
@@ -144,12 +168,12 @@ public final class UDecoder {
// read next 2 digits
if( j+2 >= cend ) {
// invalid
-throw new CharConversionException("EOF");
+throw EXCEPTION_EOF;
}
char b1= buff[j+1];
char b2=buff[j+2];
if( !isHexDigit( b1 ) || ! isHexDigit(b2 )) {
-throw new CharConversionException("isHexDigit");
+throw EXCEPTION_NOT_HEX_DIGIT;
}
j+=2;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203054 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/UDecoder.java java/org/apache/tomcat/util/http/Parameters.java
Author: kkolinko Date: Thu Nov 17 05:25:06 2011 New Revision: 1203054 URL: http://svn.apache.org/viewvc?rev=1203054&view=rev Log: Merged revisions r1203047 r1203049 r1203052 from tomcat/trunk: Reduce overhead from exception handling, using ProxyDirContext.NOT_FOUND_EXCEPTION as an example. Limit second string scan using results from the first one. Use findByte() instead of indexOf(). Implementation is the same, but it is more fair to its arguments. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 17 05:25:06 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860 +/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,
svn commit: r1203077 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Nov 17 06:35:18 2011 New Revision: 1203077 URL: http://svn.apache.org/viewvc?rev=1203077&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=1203077&r1=1203076&r2=1203077&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 17 06:35:18 2011 @@ -119,6 +119,12 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, rjung -1: +* Reduce overhead from exception handling in UDecoder + http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch + (r1203054 in TC7) + +1: kkolinko + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203078 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: kkolinko
Date: Thu Nov 17 06:38:08 2011
New Revision: 1203078
URL: http://svn.apache.org/viewvc?rev=1203078&view=rev
Log:
Correct typo in a comment
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203078&r1=1203077&r2=1203078&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
06:38:08 2011
@@ -87,7 +87,7 @@ public final class UDecoder {
return;
}
-// idx will be the smallest positive indexes ( first % or + )
+// idx will be the smallest positive index ( first % or + )
if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
@@ -155,6 +155,7 @@ public final class UDecoder {
return;
}
+// idx will be the smallest positive index ( first % or + )
if( (idx2 >= 0 && idx2 < idx) || idx < 0 ) {
idx=idx2;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203080 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/buf/UDecoder.java
Author: kkolinko Date: Thu Nov 17 06:44:08 2011 New Revision: 1203080 URL: http://svn.apache.org/viewvc?rev=1203080&view=rev Log: Correct typo in a comment Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 17 06:44:08 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,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,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,1187 753,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,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052 +/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,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,11782
svn commit: r1203089 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Nov 17 07:25:21 2011 New Revision: 1203089 URL: http://svn.apache.org/viewvc?rev=1203089&view=rev Log: Update proposal: include recent fixes for Parameters and UDecoder Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1203089&r1=1203088&r2=1203089&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Nov 17 07:25:21 2011 @@ -65,12 +65,12 @@ PATCHES PROPOSED TO BACKPORT: New filter FailedRequestFilter that will reject a request if there were errors during HTTP parameter parsing. (kkolinko) - http://people.apache.org/~kkolinko/patches/2011-11-12_tc55_parameters-v4.patch - + http://svn.apache.org/viewvc?rev=1202705&view=rev (Parameters.java only) Before the patch: Should be created by patch tool automatically, but just to be sure: mkdir container/catalina/src/share/org/apache/catalina/filters svn add container/catalina/src/share/org/apache/catalina/filters + Apply patch: + http://people.apache.org/~kkolinko/patches/2011-11-17_tc55_parameters-v5.patch After the patch: svn propset svn:eol-style native connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/FailedRequestFilter.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52191] SHM file name for ISAPI Redirector is not unique when multiple ISAPI Redirectors on Website
https://issues.apache.org/bugzilla/show_bug.cgi?id=52191 --- Comment #2 from Mladen Turk 2011-11-17 07:34:49 UTC --- Have you checked the latest trunk. I added shmemName now has APP_POOL_ID which should allow more unique name. Also could you explain the purpose of having multiple ISAPI redirectors's installed. I mean you can't do that for any of the integral IIS extensions/filters (or you can do that for FastCGI for example?) I tend to actually make a logic that would explicitly detect and forbid such cases instead allowing them. Redirector should be loaded once per IIS instance. We use so many static variables since design presumes we are loaded once per process. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1198553 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java test/org/apache/catalina/startup/TomcatBaseTest.java webapps/docs/changelog.xml webapps/do
On 17/11/2011 00:39, Konstantin Kolinko wrote: > 2011/11/17 Mark Thomas : >> On 06/11/2011 20:52, kkoli...@apache.org wrote: >>> Author: kkolinko >>> Date: Sun Nov 6 20:52:33 2011 >>> New Revision: 1198553 >>> >>> URL: http://svn.apache.org/viewvc?rev=1198553&view=rev >>> Log: >>> Merged revisions r1197158, r1198552 from tomcat/trunk: >>> Add new attribute to AbstractEndpoint and use it to speed up Tomcat tests. >>> If the attribute "fastShutdown" is set on the endpoint, >>> the usual wait of 1 sec during pause() is skipped. >> >> I'm seeing unit test failures (with a JVM crash) on 64-bit Ubuntu Linux >> with this patch that go away if I disable the fast shut-down. I only >> have a single result that shows this. I need to do multiple tests to >> confirm the result. >> > > What connector that is? Sorry, HTTP APR. > Rainer wrote about APR/TCnative 1.1.22 with APR 1.4.5. > Java VM: Java HotSpot(TM) Server VM (20.4-b02 mixed mode solaris-sparc ): > > http://tomcat.markmail.org/thread/a5quoui2soe6qb33 > > > There is also a user report > that sounds as reproducible, though may not be related to this specific issue: > > https://issues.apache.org/bugzilla/show_bug.cgi?id=52153 > "periodic JVM crash (access violation) on buffer flush" It happens on connector shut down so I think it is a different issue. Cheers, Mark >> I'm not too bothered right now since this won't affect production >> systems but I'd like to get to the bottom of it. >> >> Any thoughts welcome. >> > > Best regards, > Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1203091 - /tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Author: kkolinko
Date: Thu Nov 17 07:55:08 2011
New Revision: 1203091
URL: http://svn.apache.org/viewvc?rev=1203091&view=rev
Log:
- Align %2f handling (aka CVE-2007-0450 fix) between implementations of
UDecoder.convert().
- Make convert(MessageBytes) to consistently throw an IOException, even if it
calls convert(String).
convert(String) and convert(CharChunk) are rare cases with little impact
(and inherent bug: hardcoded handling of %xx as ISO-8859-1).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?rev=1203091&r1=1203090&r2=1203091&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Thu Nov 17
07:55:08 2011
@@ -92,7 +92,7 @@ public final class UDecoder {
idx=idx2;
}
-boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
+final boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
for( int j=idx; j
