Re: svn commit: r1614165 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

[Konstantin Kolinko]

2014-12-07 7:45 GMT+03:00 Konstantin Kolinko :
> 2014-07-29 0:42 GMT+04:00  :
>> Author: markt
>> Date: Mon Jul 28 20:42:46 2014
>> New Revision: 1614165
>>
>> URL: http://svn.apache.org/r1614165
>> Log:
>> Correct the label in the list of sessions by idle time for the bin that 
>> represents the idle time immediately below the maximum permitted idle time 
>> when using the expire command of the Manager application.
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/   (props changed)
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>
>> Propchange: tomcat/tc7.0.x/trunk/
>> --
>>   Merged /tomcat/trunk:r1614163
>>
>> Modified: 
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1614165&r1=1614164&r2=1614165&view=diff
>> ==
>> --- 
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
>> (original)
>> +++ 
>> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
>> Mon Jul 28 20:42:46 2014
>> @@ -1194,18 +1194,13 @@ public class ManagerServlet extends Http
>>  writer.println(smClient.getString(
>>  "managerServlet.sessiontimeout",
>>  "<" + histoInterval, "" + timeout[0]));
>> -for (int i = 1; i < maxCount-1; i++) {
>> +for (int i = 1; i < maxCount; i++) {
>>  if (timeout[i] > 0)
>>  writer.println(smClient.getString(
>>  "managerServlet.sessiontimeout",
>>  "" + (i)*histoInterval + " - <" + 
>> (i+1)*histoInterval,
>>  "" + timeout[i]));
>>  }
>> -if (timeout[maxCount-1] > 0)
>> -writer.println(smClient.getString(
>> -"managerServlet.sessiontimeout",
>> -">=" + maxCount*histoInterval,
>> -"" + timeout[maxCount-1]));
>
> Actually I think that the above part of this change is wrong.
>
> The only change that was needed was to replace
>
>">=" + maxCount*histoInterval,
> with
>">=" + (maxCount-1)*histoInterval,
>
>>  if (notimeout > 0)
>>  writer.println(smClient.getString(
>>  "managerServlet.sessiontimeout.unlimited",
>> @@ -1213,7 +1208,7 @@ public class ManagerServlet extends Http
>>  if (idle >= 0)
>>  writer.println(smClient.getString(
>>  "managerServlet.sessiontimeout.expired",
>> -"" + idle,"" + expired));
>> +">" + idle,"" + expired));
>>  } catch (Throwable t) {
>>  ExceptionUtils.handleThrowable(t);
>>  log("ManagerServlet.sessions[" + displayPath + "]", t);
>>
>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1614165&r1=1614164&r2=1614165&view=diff
>> ==
>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 28 20:42:46 2014
>> @@ -56,6 +56,15 @@
>>issues to not "pop up" wrt. others).
>>  -->
>>  
>> +  
>> +
>> +  
>> +Correct the label in the list of sessions by idle time for the bin 
>> that
>> +represents the idle time immediately below the maximum permitted 
>> idle
>> +time when using the expire command of the Manager application. 
>> (markt)
>> +  
>> +
>> +  
>>  
>>  
>>
>
>
> Though the only way to see the difference is when the background
> thread is stuck and no longer processes expirations. If there is a
> session that is idle for 40 minutes then it will be counted in the
> last bucket:
>
> else if (time >= maxCount)
> timeout[maxCount-1]++;
>
> The label for its counter shall be ">=29", not "29 - <30".
>
> Example to reproduce this issue:
> Configure examples webapp with the following in its web.xml
> 
> 2
> 
>
> and the following in its META-INF/context.xml:
> 
>
> Actually it would be better to use a separate counter for such overly
> idle sessions, to be able to distinct them from those that have time
> between 29 and 30.

Filed as BZ 57323, fixed by r1643656.

Best regards,
Konstantin Kolinko

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

[Bug 57323] Correct display of outdated sessions in sessions count listing in Manager application

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Konstantin Kolinko  ---
Fixed in Tomcat trunk, 8 and 7 (r1643654/r1643655/r1643656). It will be in
7.0.58, 8.0.16.

-- 
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: r1643656 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 07:49:02 2014
New Revision: 1643656

URL: http://svn.apache.org/r1643656
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57323
Correct display of outdated sessions in sessions count listing in Manager 
application
Use separate slot for their counter.

Merged r1643655 from tomcat/tc8.0.x/trunk (r1643654 from tomcat/trunk).

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 07:49:02 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,137

svn commit: r1643655 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 07:45:54 2014
New Revision: 1643655

URL: http://svn.apache.org/r1643655
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57323
Correct display of outdated sessions in sessions count listing in Manager 
application
Use separate slot for their counter.

Merged r1643654 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 07:45:54 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1643655&r1=1643654&r2=1643655&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
Sun Dec  7 07:45:54 2014
@@ -1172,7 +1172,7 @@ public class ManagerServlet extends Http
 "managerServlet.sessiondefaultmax",
 "" + maxInactiveInterval));
 Session [] sessions = manager.findSessions();
-int [] timeout = new int[maxCount];
+int[] timeout = new int[maxCount + 1];
 int notimeout = 0;
 int expired = 0;
 for (int i = 0; i < sessions.length; i++) {
@@ -1185,7 +1185,7 @@ public class ManagerServlet extends Http
 if (time < 0)
 notimeout++;
 else if (time >= maxCount)
-timeout[maxCount-1]++;
+timeout[maxCount]++;
 else
 timeout[time]++;
 }
@@ -1200,6 +1200,12 @@ public class ManagerServlet extends Http
 "" + (i)*histoInterval + " - <" + 
(i+1)*histoInterval,
 "" + timeout[i]));
 }
+if (timeout[maxCount] > 0) {
+writer.println(smClient.getString(
+"managerServlet.sessiontimeout",
+">=" + maxCount*histoInterval,
+"" + timeout[maxCount]));
+}
 if (notimeout > 0)
 writer.println(smClient.getString(
 "managerServlet.sessiontimeout.unlimited",

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643655&r1=1643654&r2=1643655&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Dec  7 07:45:54 2014
@@ -196,6 +196,10 @@
 Fix ambiguity of section links on Valves configuration reference page.
 (kkolinko)
   
+  
+57323: Correct display of outdated sessions in sessions
+count listing in Manager application. (kkolinko)
+  
 
   
   



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

svn commit: r1643654 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 07:40:37 2014
New Revision: 1643654

URL: http://svn.apache.org/r1643654
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57323
Correct display of outdated sessions in sessions count listing in Manager 
application
Use separate slot for their counter.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1643654&r1=1643653&r2=1643654&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Sun Dec  
7 07:40:37 2014
@@ -1172,7 +1172,7 @@ public class ManagerServlet extends Http
 "managerServlet.sessiondefaultmax",
 "" + maxInactiveInterval));
 Session [] sessions = manager.findSessions();
-int [] timeout = new int[maxCount];
+int[] timeout = new int[maxCount + 1];
 int notimeout = 0;
 int expired = 0;
 for (int i = 0; i < sessions.length; i++) {
@@ -1185,7 +1185,7 @@ public class ManagerServlet extends Http
 if (time < 0)
 notimeout++;
 else if (time >= maxCount)
-timeout[maxCount-1]++;
+timeout[maxCount]++;
 else
 timeout[time]++;
 }
@@ -1200,6 +1200,12 @@ public class ManagerServlet extends Http
 "" + (i)*histoInterval + " - <" + 
(i+1)*histoInterval,
 "" + timeout[i]));
 }
+if (timeout[maxCount] > 0) {
+writer.println(smClient.getString(
+"managerServlet.sessiontimeout",
+">=" + maxCount*histoInterval,
+"" + timeout[maxCount]));
+}
 if (notimeout > 0)
 writer.println(smClient.getString(
 "managerServlet.sessiontimeout.unlimited",



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

Bug report for Tomcat Modules [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers |
|48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite  |
|48861|New|Nor|2010-03-04|Files without AL headers  |
|49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean   |
|49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da|
|50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen|
|51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho|
|51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods   |
|52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o|
|53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe|
|54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int|
|54929|Inf|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang|
|55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ|
|56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p|
|56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio|
|56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr|
|56586|New|Nor|2014-06-02|initSQL should be committed if defaultAutoCommit =|
|56660|New|Maj|2014-06-23|Resource leak in FairBlockingQueue::poll method   |
|56765|New|Cri|2014-07-23|Classloader leak in Tomcat 8.0.9 caused by DBCP 2.|
|56775|New|Nor|2014-07-28|PoolCleanerTime schedule issue|
|56779|New|Nor|2014-07-28|Allow multiple connection initialization statement|
|56790|New|Nor|2014-07-29|Resizing pool.maxActive to a higher value at runti|
|56798|New|Nor|2014-07-31|Idle eviction strategy could perform better (and i|
|56804|New|Nor|2014-08-02|Use a default validationQueryTimeout other than "f|
|56805|New|Nor|2014-08-02|datasource.getConnection() may be unnecessarily bl|
|56837|New|Nor|2014-08-11|if validationQuery have error with timeBetweenEvic|
|56970|New|Nor|2014-09-11|MaxActive vs. MaxTotal for commons-dbcp and tomcat|
|56974|New|Nor|2014-09-12|jdbc-pool validation query defaultAutoCommit statu|
+-+---+---+--+--+
| Total   28 bugs   |
+---+

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

Bug report for Tomcat Native [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown|
|49038|Inf|Nor|2010-04-02|Crash in tcnative |
|52319|Inf|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da]  sig|
|52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i|
|53605|Inf|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash   |
|53847|Inf|Nor|2012-09-10|High CPU usage in tomcat native 1.22+ |
|53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration|
|54085|New|Nor|2012-11-01|ssl_socket_recv sometimes loops infinitely with no|
|54664|New|Reg|2013-03-11|[1.1.27 branch] Poll.remove incorrectly reports AP|
|55087|New|Cri|2013-06-10|tomcat crashes in tcnative-1.dll with OCSP when OC|
|55113|Inf|Nor|2013-06-18|FIPS-compatible OpenSSL fails fingerprint test in |
|55114|New|Nor|2013-06-18|BUILDING file in win32 source package contains UNI|
|55706|New|Nor|2013-10-25|broken apr version check in native v1.1.29 build; |
|55771|New|Maj|2013-11-12|Memory leak and then crash in org.apache.tomcat.jn|
|55797|Inf|Nor|2013-11-19|Tomcat 7.0.47 crashes using server jvm.dll and APR|
|55938|New|Nor|2013-12-29|clang-analyzer report for 1.1.31  |
|56027|Opn|Nor|2014-01-17|Unable to use TCN on RHEL6 boxes if box is booted |
|56108|New|Nor|2014-02-04|Allow user-defined Diffie-Hellman parameters  |
|56313|New|Maj|2014-03-25|Tomcat 8 crashes in tcnative-1.dll+0x7923 |
|56378|New|Nor|2014-04-09|Cert load fails if cert is located in path with no|
|56415|New|Maj|2014-04-16|EXCEPTION_ACCESS_VIOLATION (0xc005) in tcnativ|
|56878|New|Trv|2014-08-21|Checking whether unsigned int is less than zero is|
|56997|New|Reg|2014-09-19|java.lang.UnsatisfiedLinkError: org.apache.tomcat.|
|57140|New|Cri|2014-10-24|tcnative-1.dll 1.1.31 indicated in fatal error|
+-+---+---+--+--+
| Total   24 bugs   |
+---+

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

Bug report for Tomcat 7 [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|18500|New|Enh|2003-03-30|Host aliases to match by regular expression   |
|28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn  |
|40881|Opn|Enh|2006-11-02|Unable to receive message through  TCP channel -> |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page|
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm|
|49821|New|Enh|2010-08-25|Tomcat CLI [PATCH/Contribution]   |
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50504|New|Enh|2010-12-21|Allow setting query string character set trough re|
|50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern|
|50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac|
|51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class|
|51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to |
|51463|New|Enh|2011-07-01|Tomcat.setBaseDir  (package org.apache.catalina.st|
|51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul|
|51587|New|Enh|2011-07-29|Implement status and uptime commands  |
|51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter [PATC|
|52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site|
|52381|New|Enh|2011-12-22|Please add OSGi metadata  |
|52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up|
|52489|New|Enh|2012-01-19|Enhancement request for code signing of war files |
|52688|New|Enh|2012-02-16|Add ability to remove old access log files [PATCHE|
|52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s|
|53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota|
|53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr|
|53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf|
|53492|New|Enh|2012-07-01|Make JspC shell multithreaded |
|53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from |
|53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l|
|54330|New|Enh|2012-12-19|Patch with some refactoring of Member.java [PATCH |
|54499|New|Enh|2013-01-29|Implementation of Extensible EL Interpreter   |
|54618|New|Enh|2013-02-28|Add filter implementing HTTP Strict Transport Secu|
|54802|New|Enh|2013-04-04|Provide location information for exceptions thrown|
|55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae|
|55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star|
|55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security |
|55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di|
|56148|New|Enh|2014-02-17|support (multiple) ocsp stapling  |
|56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest|
|56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation|
|56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co|
|56614|New|Enh|2014-06-12|Add a switch to ignore annotations detection on ta|
|56787|New|Enh|2014-07-29|Simplified jndi name parsing  |
|56848|Opn|Nor|2014-08-13|Tomcat accept-language parsing doesn't properly ha|
|56931|New|Maj|2014-09-08|VirtualDirContext requires an absolute DocBase|
|57136|Opn|Nor|2014-10-24|EL Parser escaping dollar sign not ${ or ${...}   |
|57148|

Bug report for Tomcat 8 [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing |
|51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs|
|53737|Opn|Enh|2012-08-18|Use ServletContext.getJspConfigDescriptor() in Jas|
|53930|New|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma|
|54503|New|Enh|2013-01-29|SAML2 based single sign on|
|54700|New|Enh|2013-03-15|Improvement: Add support for system property to sp|
|54741|New|Enh|2013-03-22|Add org.apache.catalina.startup.Tomcat#addWebapp(S|
|55006|New|Enh|2013-05-22|Add http proxy support for ClientEndpoint using sy|
|55243|New|Enh|2013-07-11|Add special search string for nested roles|
|55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC   |
|55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages  |
|55479|New|Enh|2013-08-24|JSR 196 (JASPIC) support in Tomcat|
|9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI  |
|55675|New|Enh|2013-10-18|Checking and handling invalid configuration option|
|55770|New|Enh|2013-11-12|Allow the crlFile to be reloaded  |
|55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp|
|55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta|
|55988|New|Enh|2014-01-11|Add parameter useCipherSuitesOrder to JSSE (BIO an|
|56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia|
|56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b|
|56397|New|Enh|2014-04-11|Establish parallel Maven-based build process  |
|56398|New|Enh|2014-04-11|Support Arquillian-based unit testing |
|56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and|
|56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components|
|56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S|
|56546|New|Enh|2014-05-19|Improve thread trace logging in WebappClassLoader.|
|56676|New|Enh|2014-06-26|Normalize access to native library|
|56713|New|Enh|2014-07-12|Limit time that incoming request waits while webap|
|56724|New|Enh|2014-07-15|Restart Container background thread if it died une|
|56777|New|Enh|2014-07-28|Allow configuration resources to be loaded from pl|
|56838|Opn|Enh|2014-08-11|Performance drop when repeatedly calling WebappCla|
|56890|Inf|Maj|2014-08-26|getRealPath returns null  |
|56917|New|Enh|2014-09-05|Create a configuration to write relative 302 respo|
|56966|New|Enh|2014-09-11|AccessLogValve's elapsed time has 15ms precision o|
|57021|New|Enh|2014-09-25|Improve logging in AprLifecycleListener and jni.Li|
|57108|New|Enh|2014-10-17|Implement multiple sslcontext SNI (server name ind|
|57123|New|Enh|2014-10-21|Update to Eclipse ECJ 4.4.1   |
|57130|New|Enh|2014-10-22|Allow digest.sh to accept password from a file or |
|57135|Inf|Min|2014-10-23|ImportHandler shall ignore non-public classes |
|57142|New|Enh|2014-10-24|JSP 2.3 & EL 3.0 - %page import directive & EL Imp|
|57178|New|Enh|2014-11-03|Add CorsFilter configuration option to allow reque|
|57238|New|Enh|2014-11-19|Updated SSL/TLS information for Tomcat 8/9|
|57261|New|Nor|2014-11-25|Align /vminfo and /threaddump with other Manager c|
|57267|New|Min|2014-11-26|Document /save command in ManagerServlet and Store|
|57285|New|Reg|2014-11-29|No UAC prompt if Tomcat 8.0.15 uninstaller is laun|
|57287|New|Enh|2014-11-29|Sort files listed by DefaultServlet   |
+-+---+---+--+--+
| Total   46 bugs   |
+---+

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

Bug report for Taglibs [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field   |
|38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)|
|42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements   |
|46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l|
|48333|New|Enh|2009-12-02|TLD generator |
+-+---+---+--+--+
| Total5 bugs   |
+---+

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

Bug report for Tomcat Connectors [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo|
|35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName|
|43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn|
|44290|Inf|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan|
|44349|Inf|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s|
|44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 |
|44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc|
|44571|New|Enh|2008-03-10|Limits busy per worker to a threshold |
|45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff|
|45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so|
|46337|New|Nor|2008-12-04|real worker name is wrong |
|46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca|
|47327|New|Enh|2009-06-07|remote_user not logged in apache logfile  |
|47617|Inf|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err|
|47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_|
|47714|Opn|Cri|2009-08-20|Response mixed between users  |
|47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus|
|47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit|
|47840|Inf|Min|2009-09-14|A broken worker name is written in the log file.  |
|48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the|
|48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio|
|48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert|
|48513|New|Enh|2010-01-09|IIS Quick setup instructions  |
|48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker  |
|48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv|
|48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk |
|49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form|
|49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work|
|49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat |
|49469|New|Enh|2010-06-19|Workers status page has negative number of connect|
|49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. |
|49822|New|Enh|2010-08-25|Add hash lb worker method |
|49903|New|Enh|2010-09-09|Make workers file reloadable  |
|50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c|
|52334|New|Maj|2011-12-14|recover_time is not properly used |
|52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus|
|52651|New|Nor|2012-02-13|JKSHMFile size limitation |
|53883|New|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe  on the p|
|53977|New|Maj|2012-10-07|32bits isapi connector cannot work in wow64 mode  |
|54027|New|Cri|2012-10-18|isapi send request to outside address instead of i|
|54112|Opn|Blk|2012-11-07|ISAPI redirector not working when IIS recycles|
|54117|New|Maj|2012-11-08|access violation exception in isapi_redirect.dll  |
|54177|New|Nor|2012-11-20|jkmanager generates non-well-formed XML for certai|
|54596|New|Nor|2013-02-22|Relative path functionality truncates last charact|
|54621|New|Nor|2013-02-28|[PATCH] custom mod_jk availability checks |
|54646|New|Trv|2013-03-06|socket_keepalive is sometimes 1 or true or True in|
|54923|New|Nor|2013-05-03|nsapi_redirect.so does not work with iPlanet on So|
|56005|New|Nor|2014-01-14|ISAPI redirector WEB-INF/META-INF Path Check false|
|56452|New|Nor|2014-04-24|IPv6 address and log level debug caused crash |
|56489|New|Enh|2014-05-05|Include a directory for configuration files   |
|56576|New|Enh|2014-05-29|Websocket support |
|56618|

Bug report for Tomcat 6 [2014/12/07]

[bugzilla]

+---+
| Bugzilla Bug ID   |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved)   |
| |   +-+
| |   | Severity: BLK=Blocker CRI=Critical  REG=Regression  MAJ=Major   |
| |   |   MIN=Minor   NOR=NormalENH=Enhancement TRV=Trivial |
| |   |   +-+
| |   |   | Date Posted |
| |   |   |  +--+
| |   |   |  | Description  |
| |   |   |  |  |
|41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat|
|43400|New|Enh|2007-09-14|enum support for tag libs |
|43742|New|Enh|2007-10-30|.tag compiles  performed one at a time -- extremel|
|43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output |
|44199|New|Enh|2008-01-10|expose current backlog queue size |
|44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f|
|44294|New|Enh|2008-01-25|Support for EL functions with varargs |
|44312|Opn|Enh|2008-01-28|Warn when overwritting docBase of the default Host|
|44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam|
|44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt|
|45014|New|Enh|2008-05-15|Request and Response classes should have wrappers |
|45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks|
|45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or |
|45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE|
|45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output|
|46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c|
|46263|Opn|Enh|2008-11-21|Tomcat reloading of context.xml does not update do|
|46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl|
|46350|New|Enh|2008-12-05|Maven repository should contain source bundles|
|46558|Opn|Enh|2009-01-19|Shutdown port with address binding|
|46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch|
|47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho|
|47242|New|Enh|2009-05-22|request for AJP command line client   |
|47281|New|Enh|2009-05-28|Efficiency of the JDBCStore   |
|47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session|
|47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath|
|47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked|
|48358|Opn|Enh|2009-12-09|JSP-unloading reloaded|
|48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.|
|48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b|
|48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe|
|48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr|
|48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems|
|48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static|
|48928|New|Enh|2010-03-17|An alternative solution to preloading classes when|
|49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient  |
|49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding  |
|49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/|
|49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu|
|49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c|
|50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a|
|50288|New|Enh|2010-11-17|Uploading a war file that already exists should au|
|50677|Opn|Enh|2011-01-27|Allow system property variables in catalina.proper|
|50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull |
|51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound|
|51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages   |
|52791|New|Enh|2012-02-28|[PATCH] read windows installer default values from|
|52924|New|Enh|2012-03-15|Add support for per-application JSP compile config|
|53011|New|Enh|2012-03-31|Ant Jasper task fails after one error |
|53031|New|Enh|2012-04-03|Ant Jasper task should support Fork option|
|53677|New|Nor|2012-08-07|ArrayIndexOutOfBoundsException when response heade|
|53971|

[Bug 57323] New: Correct display of outdated sessions in sessions count listing in Manager application

[bugzilla]

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

Bug ID: 57323
   Summary: Correct display of outdated sessions in sessions count
listing in Manager application
   Product: Tomcat 7
   Version: 7.0.57
  Hardware: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Manager
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

A minor issue, reported in Re:r1614165,
http://markmail.org/message/4iplahbcanujbqoo

The Manager application has commands that display distribution of sessions
according to their idle time. (The commands are "/text/sessions",
"/text/expire" in Test GUI and "Expire Sessions" button in HTML GUI.)

The commands display how many sessions have idle time <1 minute, from 1 up to 2
minutes (1 - <2), from 2 to 3 (2 - <3) and so on.

Lets assume that a web application is configured with session-timeout of 30
minutes. Before r1614165 (in 7.0.56)/r1614163 (in 8.0.11) the last time slot in
that statistics was labeled ">= 30". In those revisions it was fixed to be
labeled "29 - <30".

Actually it should have been labeled ">= 29", as sessions that have idle time
more than 30 minutes are actually added to the value,

 else if (time >= maxCount)
 timeout[maxCount-1]++; 

It would be better to count outdated sessions in a separate time slot, so that 
"29 - <30" and ">=30" were two distinct numbers.

One may see ">=30" sessions if the thread that performs expiration have not run
yet (or is stuck).


An incorrect configuration to test this behaviour:
1. Configure examples application with the following text in its web.xml

 
  2
  
and the following META-INF/context.xml
 

2. Configure a user with roles manager-script and manager-gui. Start Tomcat.

3. Visit example webapp -> Servlet examples -> Session example to create a
session.

4. Visit http://localhost:8080/manager/html, click on sessions number on the
row for the examples webapp. A list of sessions opens. Use it to check idle
time of the session.

5. Visit http://localhost:8080/manager/text/sessions?path=/examples to see
sessions statistics.

6. Wait for 2 minutes.
Expected output of /text/sessions command is that you have a session that is
idle for more than 2 minutes.

Actual output is "1 - <2 minutes: 1 sessions"

-- 
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: r1643652 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/JspCompilationContext.java

[violetagg]

Author: violetagg
Date: Sun Dec  7 06:40:38 2014
New Revision: 1643652

URL: http://svn.apache.org/r1643652
Log:
Merged revision(s) 1643651 from tomcat/trunk:
When checking for last modified of a jar file placed in a war file:
- and the URL protocol is jar:file, it is OK to ask for a jar entry:
jar:file:!
- but when the war file is abstract, the URL point directly to the jar file:
e.g. jar:bundleentry:!/

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 06:40:38 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651

Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1643652&r1=1643651&r2=1643652&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspCompilationContext.java Sun 
Dec  7 06:40:38 2014
@@ -25,6 +25,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
 import java.util.Set;
+import java.util.jar.JarEntry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -363,7 +364,12 @@ public class JspCompilationContext {
 }
 uc = jspUrl.openConnection();
 if (uc instanceof JarURLConnection) {
-result = ((JarURLConnection) uc).getJarEntry().getTime();
+JarEntry jarEntry = ((JarURLConnection) uc).getJarEntry();
+if (jarEntry != null) {
+result = jarEntry.getTime();
+} else {
+result = uc.getLastModified();
+}
 } else {
 result = uc.getLastModified();
 }



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

svn commit: r1643651 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java

[violetagg]

Author: violetagg
Date: Sun Dec  7 06:36:18 2014
New Revision: 1643651

URL: http://svn.apache.org/r1643651
Log:
When checking for last modified of a jar file placed in a war file:
- and the URL protocol is jar:file, it is OK to ask for a jar entry:
jar:file:!
- but when war file is abstract, the URL point directly to the jar file:
e.g. jar:bundleentry:!/

Modified:
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1643651&r1=1643650&r2=1643651&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Sun Dec  7 
06:36:18 2014
@@ -25,6 +25,7 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
 import java.util.Set;
+import java.util.jar.JarEntry;
 
 import javax.servlet.ServletContext;
 import javax.servlet.jsp.tagext.TagInfo;
@@ -363,7 +364,12 @@ public class JspCompilationContext {
 }
 uc = jspUrl.openConnection();
 if (uc instanceof JarURLConnection) {
-result = ((JarURLConnection) uc).getJarEntry().getTime();
+JarEntry jarEntry = ((JarURLConnection) uc).getJarEntry();
+if (jarEntry != null) {
+result = jarEntry.getTime();
+} else {
+result = uc.getLastModified();
+}
 } else {
 result = uc.getLastModified();
 }



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

svn commit: r1643650 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/scan/StandardJarScanner.java

[violetagg]

Author: violetagg
Date: Sun Dec  7 06:05:01 2014
New Revision: 1643650

URL: http://svn.apache.org/r1643650
Log:
Merged revision 1643649 from tomcat/trunk:
Remove "JNDI" schema from StandardJarScanner.java it is not needed anymore.

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

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 06:05:01 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1643650&r1=1643649&r2=1643650&view=diff
==
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
Sun Dec  7 06:05:01 2014
@@ -306,8 +306,7 @@ public class StandardJarScanner implemen
 callback.scan((JarURLConnection) conn, webappPath, isWebapp);
 } else {
 String urlStr = url.toString();
-if (urlStr.startsWith("file:") || urlStr.startsWith("jndi:") ||
-urlStr.startsWith("http:") || urlStr.startsWith("https:")) 
{
+if (urlStr.startsWith("file:") || urlStr.startsWith("http:") || 
urlStr.startsWith("https:")) {
 if (urlStr.endsWith(Constants.JAR_EXT)) {
 URL jarURL = new URL("jar:" + urlStr + "!/");
 callback.scan((JarURLConnection) jarURL.openConnection(),



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

svn commit: r1643649 - /tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

[violetagg]

Author: violetagg
Date: Sun Dec  7 06:02:55 2014
New Revision: 1643649

URL: http://svn.apache.org/r1643649
Log:
Remove "JNDI" schema from StandardJarScanner.java it is not needed anymore.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1643649&r1=1643648&r2=1643649&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Sun 
Dec  7 06:02:55 2014
@@ -306,8 +306,7 @@ public class StandardJarScanner implemen
 callback.scan((JarURLConnection) conn, webappPath, isWebapp);
 } else {
 String urlStr = url.toString();
-if (urlStr.startsWith("file:") || urlStr.startsWith("jndi:") ||
-urlStr.startsWith("http:") || urlStr.startsWith("https:")) 
{
+if (urlStr.startsWith("file:") || urlStr.startsWith("http:") || 
urlStr.startsWith("https:")) {
 if (urlStr.endsWith(Constants.JAR_EXT)) {
 URL jarURL = new URL("jar:" + urlStr + "!/");
 callback.scan((JarURLConnection) jarURL.openConnection(),



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

Re: svn commit: r1614165 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

[Konstantin Kolinko]

2014-07-29 0:42 GMT+04:00  :
> Author: markt
> Date: Mon Jul 28 20:42:46 2014
> New Revision: 1614165
>
> URL: http://svn.apache.org/r1614165
> Log:
> Correct the label in the list of sessions by idle time for the bin that 
> represents the idle time immediately below the maximum permitted idle time 
> when using the expire command of the Manager application.
>
> Modified:
> tomcat/tc7.0.x/trunk/   (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> --
>   Merged /tomcat/trunk:r1614163
>
> Modified: 
> tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1614165&r1=1614164&r2=1614165&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
> (original)
> +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
> Mon Jul 28 20:42:46 2014
> @@ -1194,18 +1194,13 @@ public class ManagerServlet extends Http
>  writer.println(smClient.getString(
>  "managerServlet.sessiontimeout",
>  "<" + histoInterval, "" + timeout[0]));
> -for (int i = 1; i < maxCount-1; i++) {
> +for (int i = 1; i < maxCount; i++) {
>  if (timeout[i] > 0)
>  writer.println(smClient.getString(
>  "managerServlet.sessiontimeout",
>  "" + (i)*histoInterval + " - <" + 
> (i+1)*histoInterval,
>  "" + timeout[i]));
>  }
> -if (timeout[maxCount-1] > 0)
> -writer.println(smClient.getString(
> -"managerServlet.sessiontimeout",
> -">=" + maxCount*histoInterval,
> -"" + timeout[maxCount-1]));

Actually I think that the above part of this change is wrong.

The only change that was needed was to replace

   ">=" + maxCount*histoInterval,
with
   ">=" + (maxCount-1)*histoInterval,

>  if (notimeout > 0)
>  writer.println(smClient.getString(
>  "managerServlet.sessiontimeout.unlimited",
> @@ -1213,7 +1208,7 @@ public class ManagerServlet extends Http
>  if (idle >= 0)
>  writer.println(smClient.getString(
>  "managerServlet.sessiontimeout.expired",
> -"" + idle,"" + expired));
> +">" + idle,"" + expired));
>  } catch (Throwable t) {
>  ExceptionUtils.handleThrowable(t);
>  log("ManagerServlet.sessions[" + displayPath + "]", t);
>
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1614165&r1=1614164&r2=1614165&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul 28 20:42:46 2014
> @@ -56,6 +56,15 @@
>issues to not "pop up" wrt. others).
>  -->
>  
> +  
> +
> +  
> +Correct the label in the list of sessions by idle time for the bin 
> that
> +represents the idle time immediately below the maximum permitted idle
> +time when using the expire command of the Manager application. 
> (markt)
> +  
> +
> +  
>  
>  
>


Though the only way to see the difference is when the background
thread is stuck and no longer processes expirations. If there is a
session that is idle for 40 minutes then it will be counted in the
last bucket:

else if (time >= maxCount)
timeout[maxCount-1]++;

The label for its counter shall be ">=29", not "29 - <30".

Example to reproduce this issue:
Configure examples webapp with the following in its web.xml

2


and the following in its META-INF/context.xml:


Actually it would be better to use a separate counter for such overly
idle sessions, to be able to distinct them from those that have time
between 29 and 30.

Best regards,
Konstantin Kolinko

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

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643647
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1643648 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 04:16:45 2014
New Revision: 1643648

URL: http://svn.apache.org/r1643648
Log:
CTR: docs
Document /expire command.
There are two differences versus Tomcat 7:
a) The command is called as /manager/expire instead of /manager/text/expire
b) The last line of output is different (from r1614165)

Merged revision 1643647 from tomcat/tc7.0.x/trunk
(r1641729 from tomcat/tc8.0.x/trunk, r1641721 from tomcat/trunk).

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 04:16:45 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643572,1643585-1643586,1643642
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641730,1643571,1643581-1643582
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,99304

svn commit: r1643647 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/manager-howto.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 03:49:36 2014
New Revision: 1643647

URL: http://svn.apache.org/r1643647
Log:
Document /expire command.
Merged revision 1641729 from tomcat/tc8.0.x/trunk (r1641721 from tomcat/trunk).

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 03:49:36 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374086,1374823,1376994,1377078,1377292,137731
 
1,1377342,1377433,137744

svn commit: r1643646 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/html-manager-howto.xml webapps/docs/manager-howto.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 03:35:06 2014
New Revision: 1643646

URL: http://svn.apache.org/r1643646
Log:
CTR: docs
Improve documentation of the Manager application:

Merged revision 1643642 from tomcat/tc7.0.x/trunk:
(revision 1641726 from tomcat/tc8.0.x/trunk,
revisions r1641707 and r1641718 from tomcat/trunk).

r1641707: Wrap parameters that are common to all commands into a "Common 
Parameters" subsection.
r1641718: Arrange description of variants of Deploy command as subsections.

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 03:35:06 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643572,1643585-1643586
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641730,1643571,1643581-1643582
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-96617

buildbot exception in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643642
Blamelist: kkolinko

BUILD FAILED: exception upload_1

Sincerely,
 -The Buildbot




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

svn commit: r1643642 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/html-manager-howto.xml webapps/docs/manager-howto.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 03:15:18 2014
New Revision: 1643642

URL: http://svn.apache.org/r1643642
Log:
Improve documentation of the Manager application:

Merged revision 1641726 from tomcat/tc8.0.x/trunk
(revisions r1641707 and r1641718 from tomcat/trunk).

r1641707: Wrap parameters that are common to all commands into a "Common 
Parameters" subsection, so that they are listed in TOC.
r1641718: Arrange description of variants of Deploy command as subsections, so 
that have a bigger header (h5->h4) and are listed in TOC.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 03:15:18 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,137

svn commit: r1643639 - /tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:45:57 2014
New Revision: 1643639

URL: http://svn.apache.org/r1643639
Log:
svn:eol-style=native

Modified:

tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
   (props changed)

Propchange: 
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
--
svn:eol-style = native



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

svn commit: r1643638 - in /tomcat/tc8.0.x/trunk/res/META-INF: jasper.jar/services/javax.servlet.ServletContainerInitializer tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Co

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:44:15 2014
New Revision: 1643638

URL: http://svn.apache.org/r1643638
Log:
svn:eol-style=native

Modified:

tomcat/tc8.0.x/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
   (props changed)

tomcat/tc8.0.x/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
   (props changed)

Propchange: 
tomcat/tc8.0.x/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
--
svn:eol-style = native

Propchange: 
tomcat/tc8.0.x/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
--
svn:eol-style = native



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

svn commit: r1643637 - in /tomcat/tc7.0.x/trunk: ./ build.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:42:55 2014
New Revision: 1643637

URL: http://svn.apache.org/r1643637
Log:
Add service files from /res/META-INF/tomcat-websocket.jar/services/ to the list 
of text files.
Merged revision 1643635 from tomcat/tc8.0.x/trunk (r1643634 from tomcat/trunk).

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 02:42:55 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374086,1374823,1376994,1377078,1377292,137731
 
1,1377342,1377433,1377444,1377516,1377518-1

svn commit: r1643635 - in /tomcat/tc8.0.x/trunk: ./ build.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:40:17 2014
New Revision: 1643635

URL: http://svn.apache.org/r1643635
Log:
Add service files from /res/META-INF/tomcat-websocket.jar/services/ to the list 
of text files.
Merged revision 1643634 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/build.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  7 02:40:17 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634

Modified: tomcat/tc8.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1643635&r1=1643634&r2=1643635&view=diff
==
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Sun Dec  7 02:40:17 2014
@@ -246,6 +246,8 @@
 
 
 
+
+
 
 
 



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

svn commit: r1643634 - /tomcat/trunk/build.xml

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:25:01 2014
New Revision: 1643634

URL: http://svn.apache.org/r1643634
Log:
Add service files from /res/META-INF/tomcat-websocket.jar/services/ to the list 
of text files.

Now they have several lines, as Apache License header was added to them.

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1643634&r1=1643633&r2=1643634&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Dec  7 02:25:01 2014
@@ -246,6 +246,8 @@
 
 
 
+
+
 
 
 



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

svn commit: r1643633 - /tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:20:58 2014
New Revision: 1643633

URL: http://svn.apache.org/r1643633
Log:
svn:eol-style=native

Modified:

tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
   (props changed)

Propchange: 
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
--
svn:eol-style = native



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

svn commit: r1643632 - /tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:19:10 2014
New Revision: 1643632

URL: http://svn.apache.org/r1643632
Log:
svn:eol-style=native

Modified:

tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
   (props changed)

Propchange: 
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
--
svn:eol-style = native



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

svn commit: r1643631 - /tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationFilterChain.java

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:16:00 2014
New Revision: 1643631

URL: http://svn.apache.org/r1643631
Log:
svn:eol-style=native

Modified:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationFilterChain.java
   (props changed)

Propchange: 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestApplicationFilterChain.java
--
svn:eol-style = native



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

svn commit: r1643630 - /tomcat/trunk/test/org/apache/catalina/core/TestApplicationFilterChain.java

[kkolinko]

Author: kkolinko
Date: Sun Dec  7 02:14:44 2014
New Revision: 1643630

URL: http://svn.apache.org/r1643630
Log:
svn:eol-style=native

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestApplicationFilterChain.java  
 (props changed)

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



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

[Tomcat Wiki] Update of "FAQ/Troubleshooting_and_Diagnostics" by KonstantinKolinko

[Apache Wiki]

Dear Wiki user,

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

The "FAQ/Troubleshooting_and_Diagnostics" page has been changed by 
KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Troubleshooting_and_Diagnostics?action=diff&rev1=12&rev2=13

Comment:
Add some common troubleshooting scenario

  
  From Java 6 a process needn't have the management agent enabled when it 
starts, as the Attach API permits the management agent to be activated on 
demand.
  
+ == Common Troubleshooting Scenario ==
+ 
+ If you ''have already looked into Tomcat logs'', there are no error messages, 
and you just want to find out what is going on, you may try the following
+ 
+  1. Look into [[HowTo#How_do_I_log_requests_.3F|Tomcat access log]] (the log 
file generated by AccessLogValve).
+ 
+   *  If your request is not listed there, then it has not been processed by 
Tomcat. You need to look elsewhere (e.g. at your firewall).
+ 
+  2. [[HowTo#How_do_I_obtain_a_heap_dump.3F|Take a thread dump]]. This way you 
will find out what Tomcat is actually doing.
+ 
+   *  If you are troubleshooting some process that takes noticeable time, take 
several (three) thread dumps with some interval between them. This way you will 
see if there are any changes, any progress.
+ 
+  3. Try [[FAQ/Developing#Debugging|debugging]].
+ 
+   *  A good place for a breakpoint is 
`org.apache.catalina.connector.CoyoteAdapter.service()` method. That is the 
entry point from Tomcat connectors and into the Servlet engine. At that place 
your request have already been received and its processing starts.
+ 
  
  [[CategoryFAQ]]
  

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

[Tomcat Wiki] Update of "FAQ/Troubleshooting_and_Diagnostics" by KonstantinKolinko

[Apache Wiki]

Dear Wiki user,

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

The "FAQ/Troubleshooting_and_Diagnostics" page has been changed by 
KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Troubleshooting_and_Diagnostics?action=diff&rev1=11&rev2=12

Comment:
Add category link.

  
  From Java 6 a process needn't have the management agent enabled when it 
starts, as the Attach API permits the management agent to be activated on 
demand.
  
+ 
+ [[CategoryFAQ]]
+ 

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

[Tomcat Wiki] Update of "FAQ/Developing" by KonstantinKolinko

[Apache Wiki]

Dear Wiki user,

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

The "FAQ/Developing" page has been changed by KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Developing?action=diff&rev1=19&rev2=20

Comment:
Add link to Tomcat 8 documentation

  If you look in (project 
root)/res/ide-support/eclipse/java-compiler-errors-warnings.txt, you'll see a 
set of compiler warnings and import organization rules that you will have to 
set up manually in your project. If you set those up properly, you are more 
likely to submit cleaner patches.
  
  A full explanation for Tomcat in Eclipse can be found here:
+  * Tomcat 8.0.x: 
http://tomcat.apache.org/tomcat-8.0-doc/building.html#Building_with_Eclipse
   * Tomcat 7.0.x: 
http://tomcat.apache.org/tomcat-7.0-doc/building.html#Building_with_Eclipse
   * Tomcat 6.0.x: 
http://tomcat.apache.org/tomcat-6.0-doc/building.html#Building_with_Eclipse
  

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

[Tomcat Wiki] Update of "FAQ/Troubleshooting_and_Diagnostics" by KonstantinKolinko

[Apache Wiki]

Dear Wiki user,

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

The "FAQ/Troubleshooting_and_Diagnostics" page has been changed by 
KonstantinKolinko:
https://wiki.apache.org/tomcat/FAQ/Troubleshooting_and_Diagnostics?action=diff&rev1=10&rev2=11

Comment:
Add link to FAQ/Developing page

- Page stub for Troubleshooting and Diagnostics techniques.
+ Troubleshooting and Diagnostics techniques.
  
  == Techniques & Reference ==
   * [[HowTo#How_do_I_obtain_a_thread_dump_of_my_running_webapp_.3F| How To: 
Capture a thread dump]]
   * [[HowTo#How_do_I_obtain_a_heap_dump.3F| How To: Capture a heap dump]]
   * [[HowTo#How_do_I_read_a_stack_trace.3F| How To: Examine a Stacktrace]]
   * [[HowTo#How_do_I_debug_a_Tomcat_application.3F| How To: Configure Tomcat 
for debugging]]
+  * [[FAQ/Developing| FAQ: Developing]]
   * [[FAQ/Memory| FAQ: Memory]]
   * [[MemoryLeakProtection| Tomcat Memory Leak Protection]]
   * [[http://java.sun.com/developer/technicalArticles/J2SE/monitoring/| Sun 
Technical Article: Monitoring and Managing Java SE 6 Platform Applications]]

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

svn commit: r1643613 - /tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 20:51:19 2014
New Revision: 1643613

URL: http://svn.apache.org/r1643613
Log:
Align algorithm that generates anchor names in Tomcat documentation with Tomcat 
6/7/8/9
- Simplify an XPath expression.
- Change algorithm for generation of unambiguous anchor names.

For current Tomcat site this does not change anything in generated 
documentation.

Port of r1643611.

Modified:
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl

Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=1643613&r1=1643612&r2=1643613&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Sat Dec  6 20:51:19 2014
@@ -224,9 +224,9 @@
 
 
   
-
+
   
   
 
@@ -264,10 +264,10 @@
   
 
 
-  
-
+
   
   
 



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

svn commit: r1643611 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 20:44:40 2014
New Revision: 1643611

URL: http://svn.apache.org/r1643611
Log:
CTR: documentation webapp
Align algorithm that generates anchor names in Tomcat documentation with Tomcat 
7/8/9:
- Simplify an XPath expression.
- Change algorithm for generation of unambiguous anchor names.

For current Tomcat 6 this does not change anything in generated documentation, 
but it should help with future backports.

Merged revisions r1643585 and r1643586 from Tomcat 7.
(r1643581 and r1643582 of Tomcat 8, r1643045 and r1643054 of Trunk)

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 20:44:40 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643572
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641730,1643571
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,96386

[Bug 54143] Add display of PermGen memory pool usage to the Status page of the Manager webapp

[bugzilla]

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

--- Comment #3 from Konstantin Kolinko  ---
Applied to Tomcat 6 in r1643600 and will be in 6.0.44 onwards.

-- 
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: r1643600 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml webapps/manager/status.xsd webapps/manager/xform.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 20:06:15 2014
New Revision: 1643600

URL: http://svn.apache.org/r1643600
Log:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54143
  1. Add display of memory pools usage (including PermGen) to the Status page
  of the Manager web application.
  
  2. Fix several issues with status.xsd schema in Manager web
  application, testing it against actual output of StatusTransformer
  class. Add the new  element to the schema.

  To test the schema, one can save output of /manager/status?XML=true command 
and
  add the following attributes to the root  element:

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="status.xsd"

  This fixes the following schema issues:
  1) Remove minSpareThreads, maxSpareThreads attributes from schema and XSLT.

  StatusTransformer does not generate them on threadInfo element.

  2) Correct cardinality of  and  elements.

  There are 0..inf workers, 1..inf connectors.

  (In theory there are 0..inf connectors, but if one can access the manager
  app then at least one connector is running)

  3) Correct misspelled attribute name, recieved->received.

  There are several code paths in StatusTransformer and one generated
  misspelled name, while others used the correct one. Fixed the java code
  and schema.

  4) Add the new  element to the schema.

  Backport of r1409014, r1453106, r1453119, r1348992 from tomcat/tc7.0.x/trunk
(r1348989,r1409007,r1453105,r1453112 of /tomcat/trunk).

  Justification:
To be able to monitor PermGen. The necessary APIs (MemoryPoolMXBean)
are available since Java 5.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/manager/status.xsd
tomcat/tc6.0.x/trunk/webapps/manager/xform.xsl

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 20:06:15 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1354866,1371298,1371302,1371620,1402110,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643572
+/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643572
 /tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641730,1643571
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-77852

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643586
Blamelist: kkolinko

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 57234] Use case-insensitive substring search when filtering SSLv2/v3 protocols in connectors

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #5 from Konstantin Kolinko  ---
Fixed in Tomcat 6 by r1643590 and will be in 6.0.44 onwards.

-- 
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: r1643590 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 19:25:58 2014
New Revision: 1643590

URL: http://svn.apache.org/r1643590
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57234
Make SSL protocol filtering to remove insecure protocols case
insensitive. Correct spelling of filterInsecureProtocols method.

This is
 - Backport of r1641377
 - + patch by Christopher Schultz to de-duplicate code and correct spelling of 
filterInsecureProtocols method
 - Fix a pair of compiler warnings in JSSESocketFactory.java

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1643590&r1=1643589&r2=1643590&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec  6 19:25:58 2014
@@ -28,29 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Use JSSESocketFactory.filterInsecureProtocols instead of duplicate
-  implementation of the same code.
-  
http://people.apache.org/~schultz/patches/coalesce-protocol-filtering.tc6.patch
-  (Not a back-port. No functional change.)
-  Also corrects spelling of filterInsecureProtocols method.
-+1: schultz, kkolinko
-+0: markt: Should fix BZ57234 at the same time  kkolinko: Updated patch is 
proposed below.
--1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57234
-  Make SSL protocol filtering to remove insecure protocols case
-  insensitive. Correct spelling of filterInsecureProtocols method.
-  This is
-   - Backport of r1641377
-   - + patch by Christopher Schultz to de-duplicate code and correct
-   spelling of filterInsecureProtocols method
-   - Fix a pair of compiler warnings in JSSESocketFactory.java
-(fix duplicate ';' and use generics in declaration of a local variable).
-  https://issues.apache.org/bugzilla/attachment.cgi?id=32226
-  +1: kkolinko, remm, rjung
-  +1: schultz, and I withdraw above proposal if this one is accepted
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54143
   1. Add display of memory pools usage (including PermGen) to the Status page
   of the Manager web application.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1643590&r1=1643589&r2=1643590&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sat 
Dec  6 19:25:58 2014
@@ -1144,7 +1144,7 @@ public class NioEndpoint extends Abstrac
 engine.setEnabledProtocols(sslEnabledProtocolsarr);
 } else {
 // Filter out the insecure protocols from the defaults
-
engine.setEnabledProtocols(JSSESocketFactory.filterInsecureProcotols(
+
engine.setEnabledProtocols(JSSESocketFactory.filterInsecureProtocols(
 engine.getEnabledProtocols()));
 }
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1643590&r1=1643589&r2=1643590&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Sat Dec  6 19:25:58 2014
@@ -45,6 +45,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 import javax.net.ssl.CertPathTrustManagerParameters;
@@ -174,15 +175,8 @@ public class JSSESocketFactory
 
 // Filter out all the SSL protocols (SSLv2 and SSLv3) from the defaults
 // since they are no longer considered secure
-List filteredProtocols = new ArrayList();
-for (String protocol : socket.getEnabledProtocols()) {
-if (protocol.contains("SSL")) {
-log.debug(sm.getString("jsse.excludeDefaultProtocol", 
protocol));
-continue;
-}
-filteredProtocols.add(protocol);
-}
-defaultServerProtocols = filteredProtocols.toArray(new 
String[filteredProtocols.size()]);
+defaultServerProtocols = 
filterInsecureProtocols(socket.getEnabledProtocols());
+
 if (defaultServerProtocols.length == 0) {
 log.warn(sm.ge

svn commit: r1643586 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 18:54:23 2014
New Revision: 1643586

URL: http://svn.apache.org/r1643586
Log:
Fix ambiguity of anchors on config/valve.html page.
Change algorithm for generation of unambiguous anchor names.

The issue was reported via documentation comments system.

Sample old and new anchors:
Access_Logging/Introduction
Access_Log_Valve/Introduction, Extended_Access_Log_Valve/Introduction

Merged revision 1643582 from tomcat/tc8.0.x/trunk (revision 1643054 from 
tomcat/trunk).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 18:54:23 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,

svn commit: r1643585 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 18:50:29 2014
New Revision: 1643585

URL: http://svn.apache.org/r1643585
Log:
Simplify XPath expression. Not a functional change (no changes in the output).
Merged r1643581 from tomcat/tc8.0.x/trunk (r1643045 from tomcat/trunk).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 18:50:29 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374086,1374823,1376994,1377078,1377292,137731
 
1,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535

svn commit: r1643582 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 18:28:41 2014
New Revision: 1643582

URL: http://svn.apache.org/r1643582
Log:
Fix ambiguity of anchors on config/valve.html page.
Change algorithm for generation of unambiguous anchor names.

The issue was reported via documentation comments system.

Sample old and new anchors:
Access_Logging/Introduction
Access_Log_Valve/Introduction, Extended_Access_Log_Valve/Introduction

Merged revision 1643054 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 18:28:41 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643582&r1=1643581&r2=1643582&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Dec  6 18:28:41 2014
@@ -192,6 +192,10 @@
 the security configuration guide since that attribute has moved from 
the
 Context element to the nested Resources element. (markt)
   
+  
+Fix ambiguity of section links on Valves configuration reference page.
+(kkolinko)
+  
 
   
   

Modified: tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1643582&r1=1643581&r2=1643582&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec  6 18:28:41 2014
@@ -294,7 +294,7 @@
   
-
+
   
   
 
@@ -335,7 +335,7 @@
   
-
+
   
   
 



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

svn commit: r1643581 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 18:18:36 2014
New Revision: 1643581

URL: http://svn.apache.org/r1643581
Log:
Simplify XPath expression. Not a functional change (no changes in the output).
Merged r1643045 from tomcat/trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 18:18:36 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570

Modified: tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1643581&r1=1643580&r2=1643581&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/tomcat-docs.xsl Sat Dec  6 18:18:36 2014
@@ -292,7 +292,7 @@
 
 
   
 
   
@@ -333,7 +333,7 @@
 
 
   
 
   



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

buildbot failure in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643572
Blamelist: rjung

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

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

[rjung]

Author: rjung
Date: Sat Dec  6 17:31:36 2014
New Revision: 1643575

URL: http://svn.apache.org/r1643575
Log:
Another 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=1643575&r1=1643574&r2=1643575&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec  6 17:31:36 2014
@@ -91,8 +91,8 @@ PATCHES PROPOSED TO BACKPORT:
 To be able to monitor PermGen. The necessary APIs (MemoryPoolMXBean)
 are available since Java 5.
 
-  https://issues.apache.org/bugzilla/attachment.cgi?id=32252&action=edit
-  +1: kkolinko, remm
+  https://issues.apache.org/bugzilla/attachment.cgi?id=32252
+  +1: kkolinko, remm, rjung
   -1:
 
 * Add addConnectorPort() to RemoteAddrValve and RemoteHostValve.



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

svn commit: r1643574 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/architecture/overview.xml

[rjung]

Author: rjung
Date: Sat Dec  6 17:28:25 2014
New Revision: 1643574

URL: http://svn.apache.org/r1643574
Log:
Fix typo in docs.

Backport of r1643570 from trunk,
resp. r1643571 from tc8, resp. r1643572 from tc7.

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 17:28:25 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1354866,1371298,1371302,1371620,1402110,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641730
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,948057,95
 
0164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887

svn commit: r1643572 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/architecture/overview.xml

[rjung]

Author: rjung
Date: Sat Dec  6 17:26:52 2014
New Revision: 1643572

URL: http://svn.apache.org/r1643572
Log:
Fix typo in docs.

Backport of r1643570 from trunk
resp. r1643571 from tc8.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 17:26:52 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374086,1374823,1376994,1377078,1377292,137731
 
1,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,1377831,1377852-137

svn commit: r1643571 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/architecture/overview.xml

[rjung]

Author: rjung
Date: Sat Dec  6 17:24:56 2014
New Revision: 1643571

URL: http://svn.apache.org/r1643571
Log:
Fix typo in docs.

Backport of r1643570 form trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/architecture/overview.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 17:24:56 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570

Modified: tomcat/tc8.0.x/trunk/webapps/docs/architecture/overview.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/architecture/overview.xml?rev=1643571&r1=1643570&r2=1643571&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/architecture/overview.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/architecture/overview.xml Sat Dec  6 
17:24:56 2014
@@ -94,7 +94,7 @@ connectors available with Tomcat. These
 HTTP connector which is used for
 most HTTP traffic, especially when running Tomcat as a standalone server,
 and the AJP connector which implements
-the AJP procotol used when connecting Tomcat to a web server such as
+the AJP protocol used when connecting Tomcat to a web server such as
 Apache HTTPD server. Creating a customized connector is a significant
 effort.
 



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

svn commit: r1643570 - /tomcat/trunk/webapps/docs/architecture/overview.xml

[rjung]

Author: rjung
Date: Sat Dec  6 17:23:58 2014
New Revision: 1643570

URL: http://svn.apache.org/r1643570
Log:
Fix typo in docs.

Modified:
tomcat/trunk/webapps/docs/architecture/overview.xml

Modified: tomcat/trunk/webapps/docs/architecture/overview.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/overview.xml?rev=1643570&r1=1643569&r2=1643570&view=diff
==
--- tomcat/trunk/webapps/docs/architecture/overview.xml (original)
+++ tomcat/trunk/webapps/docs/architecture/overview.xml Sat Dec  6 17:23:58 2014
@@ -94,7 +94,7 @@ connectors available with Tomcat. These
 HTTP connector which is used for
 most HTTP traffic, especially when running Tomcat as a standalone server,
 and the AJP connector which implements
-the AJP procotol used when connecting Tomcat to a web server such as
+the AJP protocol used when connecting Tomcat to a web server such as
 Apache HTTPD server. Creating a customized connector is a significant
 effort.
 



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

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

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 17:21:40 2014
New Revision: 1643568

URL: http://svn.apache.org/r1643568
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=1643568&r1=1643567&r2=1643568&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec  6 17:21:40 2014
@@ -99,7 +99,7 @@ PATCHES PROPOSED TO BACKPORT:
   Partial backports of r1642564,1642606 (trunk) resp.  r1643513,1643539 (tc8)
   resp. r1643515,1643540 (tc7).
   http://people.apache.org/~rjung/patches/RemoteXXXValve-addConnectorPort.patch
-  +1: rjung
+  +1: rjung, 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

Re: svn commit: r1643323 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/security/ java/org/apache/el/parser/ java/org/apache/jasper/ java/org/apache/jasper/compiler/

[Konstantin Kolinko]

2014-12-06 19:37 GMT+03:00 Mark Thomas :
> On 06/12/2014 16:07, Konstantin Kolinko wrote:
>> 2014-12-05 18:18 GMT+03:00  :
>>> Author: markt
>>> Date: Fri Dec  5 15:18:46 2014
>>> New Revision: 1643323
>>>
>>> URL: http://svn.apache.org/r1643323
>>> Log:
>>> Replace System.getProperty("line.separator") with System.lineSeparator()
>>>
>>> Modified:
>>> tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
>>> tomcat/trunk/java/org/apache/catalina/security/Constants.java
>>> tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
>>> tomcat/trunk/java/org/apache/el/parser/ParseException.java
>>> tomcat/trunk/java/org/apache/jasper/Constants.java
>>> tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
>>> tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
>>> tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
>>> tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
>>> tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
>>> tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
>>> tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
>>> tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
>>> tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
>>> tomcat/trunk/java/org/apache/juli/VerbatimFormatter.java
>>> tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
>>> tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
>>>
>>
>> A small bikeshed issue:
>>
>> I think in many places it is better to cache the value in a local
>> final variable inside a method rather than repeatedly call the getter.
>>
>> The first example in files changed by this commit:
>> /java/org/apache/el/parser/ParseException.java
>>
>> In Jasper there are several places where line separator is used
>> repeatedly in the same method and they can benefit from such local
>> variable, e.g.
>> /java/org/apache/jasper/compiler/DefaultErrorHandler.java
>
> Are you sure? I'd expect the complier to optimise this and therefore
> prefer cleaner code.

I am not sure, but I think that this is a good guess

1) The System.lineSeparator field that this getter reads is not final.

I am not sure how much of that can be optimized.

2) I think that if we avoid repeated method calls, it results in
smaller byte code generated for the method.

In general, if the call is repeated three times or more it looks odd to me.

3) I think that I have seen similar optimizations (local variables)
elsewhere in JRE code. I remember seeing local variable that was used
to cache a field value to avoid repeated field read.

4) PrintWriter of Java 8 still has final lineSeparator field in it.


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: r1643567 - /tomcat/tc6.0.x/trunk/STATUS.txt

[rjung]

Author: rjung
Date: Sat Dec  6 17:19:57 2014
New Revision: 1643567

URL: http://svn.apache.org/r1643567
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=1643567&r1=1643566&r2=1643567&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec  6 17:19:57 2014
@@ -47,7 +47,7 @@ PATCHES PROPOSED TO BACKPORT:
- Fix a pair of compiler warnings in JSSESocketFactory.java
 (fix duplicate ';' and use generics in declaration of a local variable).
   https://issues.apache.org/bugzilla/attachment.cgi?id=32226
-  +1: kkolinko, remm
+  +1: kkolinko, remm, rjung
   +1: schultz, and I withdraw above proposal if this one is accepted
   -1:
 



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

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

[rjung]

Author: rjung
Date: Sat Dec  6 17:14:30 2014
New Revision: 1643566

URL: http://svn.apache.org/r1643566
Log:
Propose.

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=1643566&r1=1643565&r2=1643566&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec  6 17:14:30 2014
@@ -95,6 +95,12 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, remm
   -1:
 
+* Add addConnectorPort() to RemoteAddrValve and RemoteHostValve.
+  Partial backports of r1642564,1642606 (trunk) resp.  r1643513,1643539 (tc8)
+  resp. r1643515,1643540 (tc7).
+  http://people.apache.org/~rjung/patches/RemoteXXXValve-addConnectorPort.patch
+  +1: rjung
+  -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

Re: Recreate missing TC commit emails

[sebb]

On 6 December 2014 at 16:48, Rainer Jung  wrote:
> Am 06.12.2014 um 15:17 schrieb sebb:
>>
>> On 6 December 2014 at 13:19, Rainer Jung  wrote:
>>>
>>> The following commit emails are missing currently for the TC project:
>>>
> ...
>
>>> The list was crated by comparing the mails that I received with the svn
>>> log
>>> of the main tomcat directory.
>>>
>>> I wrote a simple perl script that gets the log and commit data from svn
>>> and
>>> sends a mail similar to the normal commit email. The mails will come from
>>> me
>>> and the subject will be
>>>
>>> [BACKUP] svn commit:
>>>
>>> to make them distinguishable from the automated ones.
>>
>>
>> INFRA already have a script to do this. It resends the exact original
>> e-mail.
>> (The only obvious difference is the time of the e-mail)
>> I had assumed that it was part of the subversion toolkit, but perhaps
>> it is homegrown.
>
>
> I guess infra still has higher priorities. I wanted to provide an interim
> solution for the projects I'm involved with.
>
>> Using a different subject line might cause some tools/mailing list
>> rules to break; might be better to add [RESEND] to the body.
>
>
> I have deliberately chosen this subject to not indicate the mail would be
> authoritative.

Good point.

> It wouldn't harm if we get the original emails, once infra

ditto

> has sorted out a repos wide solution to send the missing mails.

Last time SVN mails were lost, I think each project had to ask for
their missing mails.

If INFRA don't plan on resending the emails automatically, it may well
be worth asking for the Tomcat project specifically so the archives
are complete.

Infra may be able to set the correct sender as well, so it looks more
like the original.


>
> Regards,
>
>
> Rainer
>
> -
> 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

[Bug 57238] Updated SSL/TLS information for Tomcat 8/9

[bugzilla]

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

Glen Peterson  changed:

   What|Removed |Added

  Attachment #32264|0   |1
is obsolete||
  Attachment #32264|Fix for previous patch  |OOPS!  This was my
description||user-error in submitting my
   ||fixed patch twice.

--- Comment #6 from Glen Peterson  ---
Comment on attachment 32264
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32264
OOPS!  This was my user-error in submitting my fixed patch twice.

USER-ERROR SUBMISSION - please delete/ignore.

-- 
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: Recreate missing TC commit emails

[Rainer Jung]

Am 06.12.2014 um 15:17 schrieb sebb:

On 6 December 2014 at 13:19, Rainer Jung  wrote:

The following commit emails are missing currently for the TC project:


...


The list was crated by comparing the mails that I received with the svn log
of the main tomcat directory.

I wrote a simple perl script that gets the log and commit data from svn and
sends a mail similar to the normal commit email. The mails will come from me
and the subject will be

[BACKUP] svn commit:

to make them distinguishable from the automated ones.


INFRA already have a script to do this. It resends the exact original e-mail.
(The only obvious difference is the time of the e-mail)
I had assumed that it was part of the subversion toolkit, but perhaps
it is homegrown.


I guess infra still has higher priorities. I wanted to provide an 
interim solution for the projects I'm involved with.



Using a different subject line might cause some tools/mailing list
rules to break; might be better to add [RESEND] to the body.


I have deliberately chosen this subject to not indicate the mail would 
be authoritative. It wouldn't harm if we get the original emails, once 
infra has sorted out a repos wide solution to send the missing mails.


Regards,

Rainer

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

[Bug 57238] Updated SSL/TLS information for Tomcat 8/9

[bugzilla]

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

--- Comment #5 from Glen Peterson  ---
Created attachment 32264
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32264&action=edit
Fix for previous patch

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

[Bug 57309] Custom type conversion sometimes bypassed

[bugzilla]

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

--- Comment #3 from Konstantin Kolinko  ---
Reviewing r1643367
Reviewing ELSupport.compare(Object, Object) and coerceToNumber(ctx, Object,
BigDecimal.class) calls there:

1. The first branch in compare() method:
if (isBigDecimalOp(obj0, obj1)) {
BigDecimal bd0 = (BigDecimal) coerceToNumber(ctx, obj0,
BigDecimal.class);
BigDecimal bd1 = (BigDecimal) coerceToNumber(ctx, obj1,
BigDecimal.class);
return bd0.compareTo(bd1);
}

In this branch isBigDecimalOp check returned true, so one of operands is
already a BigDecimal.

QUESTION: Does coerceToNumber() need to call ELResolver to convert it? Can it
skip conversion if the object is already of the expected type.


2. Minor
if (ctx.isPropertyResolved()) {
return (Number) result;
}
It could be type.cast(result).

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

[Bug 57238] Updated SSL/TLS information for Tomcat 8/9

[bugzilla]

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

Glen Peterson  changed:

   What|Removed |Added

  Attachment #32218|0   |1
is obsolete||
 CC||g...@organicdesign.org

--- Comment #4 from Glen Peterson  ---
Created attachment 32263
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=32263&action=edit
Made changes as suggested by others.

Thank you Christopher, Mark and Konstantin for your suggestions.  I'm
responding to Christopher's numbers:

0. Author tags removed.

1a. Detailed configuration examples removed.

1b. The OpenSSL-ciphers-style configuration is specific to the ciphers
attribute.  The ssl-config doc says nothing about ciphers - that is only
referenced in the security-how-to.  I believe the two belong together, so I
left them here.

2. Made sure the old anchors are preserved.

2.5(Mark). Made links to 3rd parties no-follow

3(Konstantin). Updated the document names on the menu and introduction pages.

-- 
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: r1643323 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/security/ java/org/apache/el/parser/ java/org/apache/jasper/ java/org/apache/jasper/compiler/

[Mark Thomas]

On 06/12/2014 16:07, Konstantin Kolinko wrote:
> 2014-12-05 18:18 GMT+03:00  :
>> Author: markt
>> Date: Fri Dec  5 15:18:46 2014
>> New Revision: 1643323
>>
>> URL: http://svn.apache.org/r1643323
>> Log:
>> Replace System.getProperty("line.separator") with System.lineSeparator()
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
>> tomcat/trunk/java/org/apache/catalina/security/Constants.java
>> tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
>> tomcat/trunk/java/org/apache/el/parser/ParseException.java
>> tomcat/trunk/java/org/apache/jasper/Constants.java
>> tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
>> tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
>> tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
>> tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
>> tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
>> tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
>> tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
>> tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
>> tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
>> tomcat/trunk/java/org/apache/juli/VerbatimFormatter.java
>> tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
>> tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
>>
> 
> A small bikeshed issue:
> 
> I think in many places it is better to cache the value in a local
> final variable inside a method rather than repeatedly call the getter.
> 
> The first example in files changed by this commit:
> /java/org/apache/el/parser/ParseException.java
> 
> In Jasper there are several places where line separator is used
> repeatedly in the same method and they can benefit from such local
> variable, e.g.
> /java/org/apache/jasper/compiler/DefaultErrorHandler.java

Are you sure? I'd expect the complier to optimise this and therefore
prefer cleaner code.

Mark


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

Re: svn commit: r1643323 - in /tomcat/trunk: java/org/apache/catalina/connector/ java/org/apache/catalina/security/ java/org/apache/el/parser/ java/org/apache/jasper/ java/org/apache/jasper/compiler/

[Konstantin Kolinko]

2014-12-05 18:18 GMT+03:00  :
> Author: markt
> Date: Fri Dec  5 15:18:46 2014
> New Revision: 1643323
>
> URL: http://svn.apache.org/r1643323
> Log:
> Replace System.getProperty("line.separator") with System.lineSeparator()
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
> tomcat/trunk/java/org/apache/catalina/security/Constants.java
> tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
> tomcat/trunk/java/org/apache/el/parser/ParseException.java
> tomcat/trunk/java/org/apache/jasper/Constants.java
> tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
> tomcat/trunk/java/org/apache/jasper/compiler/DefaultErrorHandler.java
> tomcat/trunk/java/org/apache/jasper/compiler/ErrorDispatcher.java
> tomcat/trunk/java/org/apache/jasper/compiler/JavacErrorDetail.java
> tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
> tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
> tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
> tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
> tomcat/trunk/java/org/apache/juli/OneLineFormatter.java
> tomcat/trunk/java/org/apache/juli/VerbatimFormatter.java
> tomcat/trunk/java/org/apache/tomcat/buildutil/CheckEol.java
> tomcat/trunk/test/org/apache/juli/TestClassLoaderLogManager.java
>

A small bikeshed issue:

I think in many places it is better to cache the value in a local
final variable inside a method rather than repeatedly call the getter.

The first example in files changed by this commit:
/java/org/apache/el/parser/ParseException.java

In Jasper there are several places where line separator is used
repeatedly in the same method and they can benefit from such local
variable, e.g.
/java/org/apache/jasper/compiler/DefaultErrorHandler.java


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: r1643545 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 15:53:33 2014
New Revision: 1643545

URL: http://svn.apache.org/r1643545
Log:
Followup to r1643334: Replace calls to System.getProperty("path.separator") 
with File.pathSeparator
One place missed in r1643334. This is in deprecated code that we never call.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1643545&r1=1643544&r2=1643545&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 
Sat Dec  6 15:53:33 2014
@@ -173,7 +173,7 @@ public final class IntrospectionUtils {
 // Find the directory where jarName.jar is located
 
 String cpath = System.getProperty("java.class.path");
-String pathSep = System.getProperty("path.separator");
+String pathSep = File.pathSeparator;
 StringTokenizer st = new StringTokenizer(cpath, pathSep);
 while (st.hasMoreTokens()) {
 String path = st.nextToken();
@@ -250,7 +250,7 @@ public final class IntrospectionUtils {
  * @deprecated Used only by deprecated method
  */
 @Deprecated
-public static final String PATH_SEPARATOR = 
System.getProperty("path.separator");
+public static final String PATH_SEPARATOR = File.pathSeparator;
 
 /**
  * Adds classpath entries from a vector of URL's to the "tc_path_add" 
System
@@ -675,7 +675,7 @@ public final class IntrospectionUtils {
 @Deprecated
 public static void addJarsFromClassPath(Vector jars, String cp)
 throws IOException, MalformedURLException {
-String sep = System.getProperty("path.separator");
+String sep = File.pathSeparator;
 StringTokenizer st;
 if (cp != null) {
 st = new StringTokenizer(cp, sep);



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

svn commit: r1643542 - /tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 15:35:43 2014
New Revision: 1643542

URL: http://svn.apache.org/r1643542
Log:
Fix IDE warning about unboxing.

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java?rev=1643542&r1=1643541&r2=1643542&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Constants.java Sat Dec  6 
15:35:43 2014
@@ -43,8 +43,9 @@ public class Constants {
 static final byte INTERNAL_OPCODE_FLUSH = 0x18;
 
 // Buffers
-static final int DEFAULT_BUFFER_SIZE =
-
Integer.getInteger("org.apache.tomcat.websocket.DEFAULT_BUFFER_SIZE", 8 * 1024);
+static final int DEFAULT_BUFFER_SIZE = Integer.getInteger(
+"org.apache.tomcat.websocket.DEFAULT_BUFFER_SIZE", 8 * 1024)
+.intValue();
 
 // Client connection
 public static final String HOST_HEADER_NAME = "Host";
@@ -66,8 +67,9 @@ public class Constants {
 
System.getProperty("org.apache.tomcat.websocket.DEFAULT_ORIGIN_HEADER_VALUE");
 
 // Configuration for background processing checks intervals
-static final int DEFAULT_PROCESS_PERIOD =
-
Integer.getInteger("org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD", 10);
+static final int DEFAULT_PROCESS_PERIOD = Integer.getInteger(
+"org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD", 10)
+.intValue();
 
 // Configuration for extensions
 static final boolean DISABLE_BUILTIN_EXTENSIONS =



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

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

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 15:11:13 2014
New Revision: 1643540

URL: http://svn.apache.org/r1643540
Log:
Correct a typo. Mention attribute name.
Merged revision 1643539 from tomcat/tc8.0.x/trunk.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 15:11:13 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539
 
/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,

svn commit: r1643539 - /tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 15:09:51 2014
New Revision: 1643539

URL: http://svn.apache.org/r1643539
Log:
Correct a typo. Mention attribute name.

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

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643539&r1=1643538&r2=1643539&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Dec  6 15:09:51 2014
@@ -120,14 +120,15 @@
 Allow to configure RemoteAddrValve and RemoteHostValve to
 adopt behavior depending on the connector port. Implemented
 by optionally adding the connector port to the string compared
-with the patterns allow and deny
-(using addConnectorPort). (rjung)
+with the patterns allow and deny. Configured
+using addConnectorPort attribute on valve. (rjung)
   
   
-Optionally trigger authentication intead of denial in
+Optionally trigger authentication instead of denial in
 RemoteAddrValve and RemoteHostValve. This only works in
 combination with preemptiveAuthentication
-on the application context. (rjung)
+on the application context. Configured using
+invalidAuthenticationWhenDeny attribute on valve. (rjung)
   
 
   



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

[Bug 57190] ServletContext.getContext(String) cannot return context when using parallel deployments

[bugzilla]

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

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #6 from Konstantin Kolinko  ---
REOPENING. Reviewing r1642697

Using Mapper.map() for this purpose returns wrong result for missing contexts.
The mapper maps prefix of an URL, and so for getContext("/foo/bar") it may
return the context of "/foo" or the ROOT context.

I added a test case in r1643536, but commented-out the check, as it currently
fails.

This needs either a special method in Mapper or in Host (such as
getLatestVersion(contextName)), or a check that the path of returned context is
the same as expected.

A difference between Mapper and Host is that Mapper returns only those contexts
that are available. Using Host may return a context that has been stopped or
have not started yet.  The same concern for the exact match branch of this
method: does it need to return a non-started context, even if the name matches
exactly?

-- 
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: r1643536 - /tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java

[kkolinko]

Author: kkolinko
Date: Sat Dec  6 14:18:37 2014
New Revision: 1643536

URL: http://svn.apache.org/r1643536
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=57190
Test case (currently commented-out) that demonstrates that getContext() 
erroneously returns the context for "/" instead of null for a wrong context 
name.

Modified:
tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java?rev=1643536&r1=1643535&r2=1643536&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestApplicationContext.java Sat 
Dec  6 14:18:37 2014
@@ -200,6 +200,8 @@ public class TestApplicationContext exte
 Assert.assertTrue(body, body.contains("03-foo1"));
 Assert.assertTrue(body, body.contains("04-foo2"));
 Assert.assertTrue(body, body.contains("05-foo2"));
+// FIXME: Enable this test
+//Assert.assertTrue(body, body.contains("06-null"));
 }
 
 
@@ -218,6 +220,7 @@ public class TestApplicationContext exte
 pw.println("03-" + 
sc.getContext("/foo##1").getInitParameter("id"));
 pw.println("04-" + 
sc.getContext("/foo##2").getInitParameter("id"));
 pw.println("05-" + 
sc.getContext("/foo##3").getInitParameter("id"));
+pw.println("06-" + sc.getContext("/unknown"));
 }
 }
 



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

Re: Recreate missing TC commit emails

[sebb]

On 6 December 2014 at 13:19, Rainer Jung  wrote:
> The following commit emails are missing currently for the TC project:
>
> r1643041
> r1643045
> r1643054
> r1643055
> r1643065
> r1643066
> r1643069
> r1643100
> r1643104
> r1643109
> r1643121
> r1643126
>
> The list was crated by comparing the mails that I received with the svn log
> of the main tomcat directory.
>
> I wrote a simple perl script that gets the log and commit data from svn and
> sends a mail similar to the normal commit email. The mails will come from me
> and the subject will be
>
> [BACKUP] svn commit:
>
> to make them distinguishable from the automated ones.

INFRA already have a script to do this. It resends the exact original e-mail.
(The only obvious difference is the time of the e-mail)
I had assumed that it was part of the subversion toolkit, but perhaps
it is homegrown.

Using a different subject line might cause some tools/mailing list
rules to break; might be better to add [RESEND] to the body.

> I'll send the 12 mails out in a few minutes.
>
> Regards,
>
> Rainer
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

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

Re: Recreate missing TC commit emails

[Konstantin Kolinko]

2014-12-06 16:19 GMT+03:00 Rainer Jung :
> The following commit emails are missing currently for the TC project:
>
> r1643041
> r1643045
> r1643054
> r1643055
> r1643065
> r1643066
> r1643069
> r1643100
> r1643104
> r1643109
> r1643121
> r1643126
>
> The list was crated by comparing the mails that I received with the svn log
> of the main tomcat directory.
>
> I wrote a simple perl script that gets the log and commit data from svn and
> sends a mail similar to the normal commit email. The mails will come from me
> and the subject will be
>
> [BACKUP] svn commit:
>
> to make them distinguishable from the automated ones.
>
> I'll send the 12 mails out in a few minutes.

Looks good. Thank you.


Best regards,
Konstantin Kolinko

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

[BACKUP] svn commit: r1643126 - /tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

[Rainer Jung]

Author: markt
Date: 2014-12-03 16:07:05 + (Wed, 03 Dec 2014)
New Revision: r1643126

URL: http://svn.apache.org/r1643126
Log:

Fix IDE warnings

Modified:

/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

Index: 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
===
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(revision 1643125)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(revision 1643126)
@@ -421,7 +421,7 @@
 }
 
 @OnError
-public void onError(Session session, Throwable t) throws IOException {
+public void onError(@SuppressWarnings("unused") Session session, 
Throwable t) {
 t.printStackTrace();
 this.t = t;
 }
@@ -444,7 +444,7 @@
 }
 
 @OnError
-public void onError(Session session, Throwable t) throws IOException {
+public void onError(@SuppressWarnings("unused") Session session, 
Throwable t) {
 t.printStackTrace();
 this.t = t;
 }

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

[BACKUP] svn commit: r1643109 - /tomcat/tc6.0.x/trunk/STATUS.txt

[Rainer Jung]

Author: remm
Date: 2014-12-03 13:10:01 + (Wed, 03 Dec 2014)
New Revision: r1643109

URL: http://svn.apache.org/r1643109
Log:

Votes

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

Index: tomcat/tc6.0.x/trunk/STATUS.txt
===
--- tomcat/tc6.0.x/trunk/STATUS.txt (revision 1643108)
+++ tomcat/tc6.0.x/trunk/STATUS.txt (revision 1643109)
@@ -47,7 +47,7 @@
- Fix a pair of compiler warnings in JSSESocketFactory.java
 (fix duplicate ';' and use generics in declaration of a local variable).
   https://issues.apache.org/bugzilla/attachment.cgi?id=32226
-  +1: kkolinko
+  +1: kkolinko, remm
   +1: schultz, and I withdraw above proposal if this one is accepted
   -1:
 
@@ -92,7 +92,7 @@
 are available since Java 5.
 
   https://issues.apache.org/bugzilla/attachment.cgi?id=32252&action=edit
-  +1: kkolinko
+  +1: kkolinko, remm
   -1:
 
 
@@ -107,7 +107,7 @@
   2) http://svn.apache.org/r1608653
   3) http://svn.apache.org/r1608833
   4) TestMapper changes from http://svn.apache.org/r1608831
-  +1: kkolinko
+  +1: kkolinko, remm
   -1:
kkolinko: Good for occasional review, but as backporting r1608833 won't
be trivial I'd have to update the patch.

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

[BACKUP] svn commit: r1643121 - /tomcat/trunk/build.properties.default

[Rainer Jung]

Author: kkolinko
Date: 2014-12-03 13:58:18 + (Wed, 03 Dec 2014)
New Revision: r1643121

URL: http://svn.apache.org/r1643121
Log:

Update to Checkstyle 6.1.1

Modified:
/tomcat/trunk/build.properties.default

Index: tomcat/trunk/build.properties.default
===
--- tomcat/trunk/build.properties.default   (revision 1643120)
+++ tomcat/trunk/build.properties.default   (revision 1643121)
@@ -212,7 +212,7 @@
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
 # - Checkstyle, version 6.0 or later -
-checkstyle.version=6.0
+checkstyle.version=6.1.1
 checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 
checkstyle.loc=${base-sf.loc}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar

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

[BACKUP] svn commit: r1643100 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

[Rainer Jung]

Author: markt
Date: 2014-12-03 12:05:33 + (Wed, 03 Dec 2014)
New Revision: r1643100

URL: http://svn.apache.org/r1643100
Log:

Correct reason for adding extra time to expected completion time. This issue is 
not noticeable since TimeoutServlet.ASYNC_TIMEOUT and 
AsyncStartRunnable.THREAD_SLEEP_TIME were both 3000ms.

Modified:
/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Index: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
===
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(revision 1643099)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(revision 1643100)
@@ -541,8 +541,8 @@
 long timeoutDelay = TimeoutServlet.ASYNC_TIMEOUT;
 if (asyncDispatch != null && asyncDispatch.booleanValue() &&
 !completeOnTimeout.booleanValue()) {
-// Extra timeout in this case
-timeoutDelay += TimeoutServlet.ASYNC_TIMEOUT;
+// The async dispatch includes a sleep
+timeoutDelay += AsyncStartRunnable.THREAD_SLEEP_TIME;
 }
 alvGlobal.validateAccessLog(1, 200, timeoutDelay,
 timeoutDelay + TIMEOUT_MARGIN + REQUEST_TIME);

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

[BACKUP] svn commit: r1643054 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl

[Rainer Jung]

Author: kkolinko
Date: 2014-12-03 03:09:10 + (Wed, 03 Dec 2014)
New Revision: r1643054

URL: http://svn.apache.org/r1643054
Log:

Change algorithm for generation of unambiguous anchor names.
This fixes ambiguity with anchors in config/valve.html:
Old: Access_Logging/Introduction (for both Access Log Valve and Extended Access 
Log Valve)
New: Access_Log_Valve/Introduction, Extended_Access_Log_Valve/Introduction

The issue was reported via documentation comments system.

Modified:
/tomcat/trunk/webapps/docs/tomcat-docs.xsl

Index: tomcat/trunk/webapps/docs/tomcat-docs.xsl
===
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl   (revision 1643053)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl   (revision 1643054)
@@ -294,7 +294,7 @@
   
-
+
   
   
 
@@ -335,7 +335,7 @@
   
-
+
   
   
 

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

[BACKUP] svn commit: r1643104 - /tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

[Rainer Jung]

Author: markt
Date: 2014-12-03 12:20:09 + (Wed, 03 Dec 2014)
New Revision: r1643104

URL: http://svn.apache.org/r1643104
Log:

No need for a 3s timeout. Reduce to 100ms to speed up testing.

Modified:
/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java

Index: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
===
--- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(revision 1643103)
+++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java
(revision 1643104)
@@ -557,7 +557,7 @@
 private final Boolean completeOnTimeout;
 private final String dispatchUrl;
 
-public static final long ASYNC_TIMEOUT = 3000;
+public static final long ASYNC_TIMEOUT = 100;
 
 public TimeoutServlet(Boolean completeOnTimeout, String dispatchUrl) {
 this.completeOnTimeout = completeOnTimeout;

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

[BACKUP] svn commit: r1643045 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl

[Rainer Jung]

Author: kkolinko
Date: 2014-12-03 02:42:18 + (Wed, 03 Dec 2014)
New Revision: r1643045

URL: http://svn.apache.org/r1643045
Log:

Simplify XPath expression. Not a functional change (no changes in the output).

Modified:
/tomcat/trunk/webapps/docs/tomcat-docs.xsl

Index: tomcat/trunk/webapps/docs/tomcat-docs.xsl
===
--- tomcat/trunk/webapps/docs/tomcat-docs.xsl   (revision 1643044)
+++ tomcat/trunk/webapps/docs/tomcat-docs.xsl   (revision 1643045)
@@ -292,7 +292,7 @@
 
 
   
 
   
@@ -333,7 +333,7 @@
 
 
   
 
   

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

[BACKUP] svn commit: r1643065 - /tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java

[Rainer Jung]

Author: remm
Date: 2014-12-03 08:07:11 + (Wed, 03 Dec 2014)
New Revision: r1643065

URL: http://svn.apache.org/r1643065
Log:

Improve method mapping code so that it attempts to do what is described in 
section 4.8 in the websockets spec.

Modified:
/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java

Index: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
===
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java   
(revision 1643064)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java   
(revision 1643065)
@@ -23,6 +23,7 @@
 import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -79,57 +80,106 @@
 Method open = null;
 Method close = null;
 Method error = null;
+Method[] clazzPojoMethods = null;
 Class currentClazz = clazzPojo;
 while (!currentClazz.equals(Object.class)) {
-for (Method method : currentClazz.getDeclaredMethods()) {
+Method[] currentClazzMethods = currentClazz.getDeclaredMethods();
+if (currentClazz == clazzPojo) {
+clazzPojoMethods = currentClazzMethods;
+}
+for (Method method : currentClazzMethods) {
 if (method.getAnnotation(OnOpen.class) != null) {
 checkPublic(method);
 if (open == null) {
 open = method;
 } else {
-// Duplicate annotation
-throw new DeploymentException(sm.getString(
-"pojoMethodMapping.duplicateAnnotation",
-OnOpen.class, clazzPojo));
+if (currentClazz == clazzPojo ||
+(currentClazz != clazzPojo && 
!isMethodOverride(open, method))) {
+// Duplicate annotation
+throw new DeploymentException(sm.getString(
+"pojoMethodMapping.duplicateAnnotation",
+OnOpen.class, currentClazz));
+}
 }
 } else if (method.getAnnotation(OnClose.class) != null) {
 checkPublic(method);
 if (close == null) {
 close = method;
 } else {
-// Duplicate annotation
-throw new DeploymentException(sm.getString(
-"pojoMethodMapping.duplicateAnnotation",
-OnClose.class, clazzPojo));
+if (currentClazz == clazzPojo ||
+(currentClazz != clazzPojo && 
!isMethodOverride(close, method))) {
+// Duplicate annotation
+throw new DeploymentException(sm.getString(
+"pojoMethodMapping.duplicateAnnotation",
+OnClose.class, currentClazz));
+}
 }
 } else if (method.getAnnotation(OnError.class) != null) {
 checkPublic(method);
 if (error == null) {
 error = method;
 } else {
-// Duplicate annotation
-throw new DeploymentException(sm.getString(
-"pojoMethodMapping.duplicateAnnotation",
-OnError.class, clazzPojo));
+if (currentClazz == clazzPojo ||
+(currentClazz != clazzPojo && 
!isMethodOverride(error, method))) {
+// Duplicate annotation
+throw new DeploymentException(sm.getString(
+"pojoMethodMapping.duplicateAnnotation",
+OnError.class, currentClazz));
+}
 }
 } else if (method.getAnnotation(OnMessage.class) != null) {
 checkPublic(method);
 MessageHandlerInfo messageHandler = new 
MessageHandlerInfo(method, decoders);
+boolean found = false;
 for (MessageHandlerInfo otherMessageHandler : onMessage) {
 if (messageHandler.equals(otherMessageHandler)) {
-// Duplicate annotation
-throw new DeploymentException(sm.getString(
-"pojoMethodMapping.duplicateAnnotation",
-  

[BACKUP] svn commit: r1643066 - /tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java

[Rainer Jung]

Author: violetagg
Date: 2014-12-03 08:15:30 + (Wed, 03 Dec 2014)
New Revision: r1643066

URL: http://svn.apache.org/r1643066
Log:

Use the correct class when creating a logger.

Modified:
/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java

Index: tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
===
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java  
(revision 1643065)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java  
(revision 1643066)
@@ -33,7 +33,7 @@
  */
 public class JarWarResource extends AbstractArchiveResource {
 
-private static final Log log = LogFactory.getLog(JarResource.class);
+private static final Log log = LogFactory.getLog(JarWarResource.class);
 
 private final String archivePath;
 

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

[BACKUP] svn commit: r1643055 - /tomcat/trunk/webapps/docs/config/valve.xml

[Rainer Jung]

Author: kkolinko
Date: 2014-12-03 03:41:43 + (Wed, 03 Dec 2014)
New Revision: r1643055

URL: http://svn.apache.org/r1643055
Log:

Correct a typo. Make section names and anchors unambiguous.

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

Index: tomcat/trunk/webapps/docs/config/valve.xml
===
--- tomcat/trunk/webapps/docs/config/valve.xml  (revision 1643054)
+++ tomcat/trunk/webapps/docs/config/valve.xml  (revision 1643055)
@@ -553,13 +553,13 @@
 
   
 
-  
+  
 To allow access only for the clients connecting from localhost:
 
   
 
-  
+  
 To allow unrestricted access for the clients connecting from localhost
 but for all other clients only to port 8443:
 
   
 
-  
+  
 To allow unrestricted access to port 8009, but trigger basic
-authentication if the application is access on another port:
+authentication if the application is accessed on another port:
 

[BACKUP] svn commit: r1643069 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java /tomcat/tc8.0.x/trunk

[Rainer Jung]

Author: violetagg
Date: 2014-12-03 08:40:13 + (Wed, 03 Dec 2014)
New Revision: r1643069

URL: http://svn.apache.org/r1643069
Log:

Merged revision 1643066 from tomcat/trunk:
Use the correct class when creating a logger.


Modified:

/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java
/tomcat/tc8.0.x/trunk

Index: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java
===
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java  
(revision 1643068)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java  
(revision 1643069)
@@ -33,7 +33,7 @@
  */
 public class JarWarResource extends AbstractArchiveResource {
 
-private static final Log log = LogFactory.getLog(JarResource.class);
+private static final Log log = LogFactory.getLog(JarWarResource.class);
 
 private final String archivePath;
 
Index: tomcat/tc8.0.x/trunk
===
--- tomcat/tc8.0.x/trunk(revision 1643068)
+++ tomcat/tc8.0.x/trunk(revision 1643069)

Property changes on: tomcat/tc8.0.x/trunk
___
Modified: svn:mergeinfo
   Merged /tomcat/trunk:r1643066

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

[BACKUP] svn commit: r1643041 - /tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

[Rainer Jung]

Author: kkolinko
Date: 2014-12-03 02:01:47 + (Wed, 03 Dec 2014)
New Revision: r1643041

URL: http://svn.apache.org/r1643041
Log:

Fix trailing whitespace to make Checkstyle happy. Mark fields as 
volatile/final. Followup to r1642962, r1642974.

Modified:

/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java

Index: 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
===
--- 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(revision 1643040)
+++ 
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(revision 1643041)
@@ -49,6 +49,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.servlets.DefaultServlet;
 import org.apache.catalina.startup.Tomcat;
@@ -409,8 +410,8 @@
 configurator=SingletonConfigurator.class)
 public static class MessagesServer {
 
-private Queue received = new ConcurrentLinkedQueue<>();
-private Throwable t = null; 
+private final Queue received = new ConcurrentLinkedQueue<>();
+private volatile Throwable t = null;
 
 @OnMessage
 public String onMessage(String message, Session session) {
@@ -431,8 +432,8 @@
 configurator=SingletonConfigurator.class)
 public static class BatchedServer {
 
-private Queue received = new ConcurrentLinkedQueue<>();
-private Throwable t = null; 
+private final Queue received = new ConcurrentLinkedQueue<>();
+private volatile Throwable t = null;
 
 @OnMessage
 public String onMessage(String message, Session session) throws 
IOException {

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

Recreate missing TC commit emails

[Rainer Jung]

The following commit emails are missing currently for the TC project:

r1643041
r1643045
r1643054
r1643055
r1643065
r1643066
r1643069
r1643100
r1643104
r1643109
r1643121
r1643126

The list was crated by comparing the mails that I received with the svn 
log of the main tomcat directory.


I wrote a simple perl script that gets the log and commit data from svn 
and sends a mail similar to the normal commit email. The mails will come 
from me and the subject will be


[BACKUP] svn commit:

to make them distinguishable from the automated ones.

I'll send the 12 mails out in a few minutes.

Regards,

Rainer

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

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

[rjung]

Author: rjung
Date: Sat Dec  6 11:13:43 2014
New Revision: 1643523

URL: http://svn.apache.org/r1643523
Log:
Correct a typo. Make section names and anchors unambiguous.

Backport of r1643055 form trunk resp. r1643521 from tc8.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 11:13:43 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,1373993,1374000,1374019,1374086,1374823,1376994,1377078,1377292,137731
 
1,1377342,1377433,1377444,1377516,1377518-1377519,1377532,1377535,1377544,1377689,1377785,1377794,1377811,1377824,1377827,13

svn commit: r1643521 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/valve.xml

[rjung]

Author: rjung
Date: Sat Dec  6 11:11:02 2014
New Revision: 1643521

URL: http://svn.apache.org/r1643521
Log:
Correct a typo. Make section names and anchors unambiguous.

Backport of r1643055 form trunk.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 11:11:02 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml?rev=1643521&r1=1643520&r2=1643521&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml Sat Dec  6 11:11:02 2014
@@ -553,13 +553,13 @@
 
   
 
-  
+  
 To allow access only for the clients connecting from localhost:
 
   
 
-  
+  
 To allow unrestricted access for the clients connecting from localhost
 but for all other clients only to port 8443:
 
   
 
-  
+  
 To allow unrestricted access to port 8009, but trigger basic
-authentication if the application is access on another port:
+authentication if the application is accessed on another port:
 

buildbot success in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643515
Blamelist: rjung

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1643516 - /tomcat/tc6.0.x/trunk/

[rjung]

Author: rjung
Date: Sat Dec  6 10:52:45 2014
New Revision: 1643516

URL: http://svn.apache.org/r1643516
Log:
Add mergeinfo for r1614294.

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

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 10:52:45 2014
@@ -1,3 +1,3 @@
-/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1354866,1371298,1371302,1371620,1402110,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045
+/tomcat/tc7.0.x/trunk:1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1354866,1371298,1371302,1371620,1402110,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1484919,1486877,1500065,1503852,1505844,1513151,1521040,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045
 /tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641730
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
 
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
 
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,94

svn commit: r1643515 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/

[rjung]

Author: rjung
Date: Sat Dec  6 10:29:23 2014
New Revision: 1643515

URL: http://svn.apache.org/r1643515
Log:
Add optional use of connector port in allow
and deny expressions for RemoteAddrValve
and RemoteHostValve.

Allow RemoteAddreValve and RemoteHostValve to
trigger authentication instead of denying a
request with a status code.

Backports of r1642564, r1642595 and r1642606 from trunk
resp. r1643513 from tc8
(using request.SetContext() - deprecated in TC 8 -
instead of assigning to request.getMappingData().context
in TestRequestFilterValve).

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.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/test/org/apache/catalina/valves/TestRequestFilterValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 10:29:23 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,13

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio (in module tomcat-8.0.x) failed

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 59 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-NIO 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141206.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl/dest-20141206/bin/openssl
 
 -Dexecute.test.apr=false -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141206.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/bu
 
ild/lib/tomcat-spdy.jar:/srv/g

buildbot exception in ASF Buildbot on tomcat-7-trunk

[buildbot]

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1643514
Blamelist: rjung

BUILD FAILED: exception upload_1

Sincerely,
 -The Buildbot




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

svn commit: r1643514 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/valves/TestRequestFilterValve.java webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Sat Dec  6 10:02:00 2014
New Revision: 1643514

URL: http://svn.apache.org/r1643514
Log:
Add unit tests for RemoteAddrValve and RemoteHostValve.

Backport of r1642554 from trunk resp. r1643511 from tc8.

Added:

tomcat/tc7.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
  - copied unchanged from r1643511, 
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 10:02:00 2014
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 
352661,1352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1353708,1354137,1354170,1354197,1354255,1354362,1354375,1354469,1354664,1354685,1354817,1354847,1354856,1355726,1355810,1356006-1356007,1356014,1356045,1356125,1356422,1356505,1356898,1357042,1357401,1357407,1358586,1358590,1358612-1358613,1359102,1359340,1359981,1360059,1360455,1360460,1360838,1360847,1360892,1360942,1361263,1361430,1361754-1361755,1361762,1361769,1361772,1361962,1361982,1361985,1361991,1364141,1364149,1364411-1364412,1364448,1366708,1366720,1366729,1366734,1366910,1366945,1366953,1366959,1367214,1370346,1370364,1370373,1370386,1370473,1370537,1370549,1370553,1370879,1370916,1370958,1370960,1370973,1371017,1371283,1371336,1371620,1371812,1371823,1371896,1371976,1371978,1371995,1371999,1372131,1372152,1372156,1372390,1373003,1373080,1373142,1373488,1373578,1373618,1373622,1373666,1373985,1373987,1373990,13739

svn commit: r1643513 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/

[rjung]

Author: rjung
Date: Sat Dec  6 09:55:55 2014
New Revision: 1643513

URL: http://svn.apache.org/r1643513
Log:
Add optional use of connector port in allow
and deny expressions for RemoteAddrValve
and RemoteHostValve.

Allow RemoteAddreValve and RemoteHostValve to
trigger authentication instead of denying a
request with a status code.

Backports of r1642564, r1642595 and r1642606 from trunk.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/valve.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 09:55:55 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=1643513&r1=1643512&r2=1643513&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java 
Sat Dec  6 09:55:55 2014
@@ -27,12 +27,47 @@ import org.apache.catalina.connector.Res
 
 /**
  * Concrete implementation of RequestFilterValve that filters
- * based on the string representation of the remote client's IP address.
+ * based on the string representation of the remote client's IP address
+ * optionally combined with the server connector port number.
  *
  * @author Craig R. McClanahan
  */
 public final class RemoteAddrValve extends RequestFilterValve {
 
+// - Instance Variables
+
+/**
+ * Flag deciding whether we add the server connector port to the property
+ * compared in the filtering method. The port will be appended
+ * using a ";" as a separator.
+ */
+protected volatile boolean addConnectorPort = false;
+
+// - Properties
+
+
+/**
+ * Get the flag deciding whether we add the server connector port to the
+ * property compared in the filtering method. The port will be appended
+ * using a ";" as a separator.
+ */
+public boolean getAddConnectorPort() {
+return addConnectorPort;
+}
+
+
+/**
+ * Set the flag deciding whether we add the server connector port to the
+ * property compared in the filtering method. The port will be appended
+ * using a ";" as a separator.
+ *
+ * @param addConnectorPort The new flag
+ */
+public void setAddConnectorPort(boolean addConnectorPort) {
+this.addConnectorPort = addConnectorPort;
+}
+
+
 // - Public Methods
 
 /**
@@ -51,7 +86,13 @@ public final class RemoteAddrValve exten
 public void invoke(Request request, Response response)
 throws IOException, ServletException {
 
-process(request.getRequest().getRemoteAddr(), request, response);
+String property;
+if (addConnectorPort) {
+property = request.getRequest().getRemoteAddr() + ";" + 
request.getConnector().getPort(

svn commit: r1643511 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/valves/TestRequestFilterValve.java webapps/docs/changelog.xml

[rjung]

Author: rjung
Date: Sat Dec  6 09:38:00 2014
New Revision: 1643511

URL: http://svn.apache.org/r1643511
Log:
Add unit tests for RemoteAddrValve and RemoteHostValve.

Backport of r1642554 from trunk.

Added:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
  - copied unchanged from r1642554, 
tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 09:38:00 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1643511&r1=1643510&r2=1643511&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Dec  6 09:38:00 2014
@@ -113,6 +113,9 @@
 System.getProperty() where more suitable API calls are
 available. (markt)
   
+  
+Add unit tests for RemoteAddrValve and RemoteHostValve. (rjung)
+  
 
   
   



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

[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html
Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 22 mins 23 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141206/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141206.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20141206/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141206.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk/output

[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (in module tomcat-8.0.x) failed

[Bill Barker]

To whom it may engage...

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

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


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html

That said, some information snippets are provided here.

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



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build)
Work ended in a state of : Failed
Elapsed: 24 mins 9 secs
Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 -Dtest.reports=output/logs-APR 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar 
-Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20141206/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20141206.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20141206-native-src.tar.gz
 -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false 
-Dtest
 .openssl.path=/srv/gump/public/workspace/openssl/dest-20141206/bin/openssl 
-Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/build/hamcrest-all-20141206.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-8.0.x]
CLASSPATH: 
/usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja
 
r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv/gump/pub

svn commit: r1643501 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/jasper/tagplugins/jstl/core/Set.java

[markt]

Author: markt
Date: Sat Dec  6 08:09:55 2014
New Revision: 1643501

URL: http://svn.apache.org/r1643501
Log:
Follow up to r1643367. BZ57309.
Fix unit test failure.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec  6 08:09:55 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643474
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642668,1642679,1642697,1642699,1643002,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java?rev=1643501&r1=1643500&r2=1643501&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/tagplugins/jstl/core/Set.java 
Sat Dec  6 08:09:55 2014
@@ -68,14 +68,14 @@ public class Set implements TagPlugin {
 //get the iScope according to the strScope
 iScope = Util.getScope(strScope);
 
+String jspCtxt = null;
+if (ctxt.isTagFile()) {
+jspCtxt = "this.getJspContext()";
+} else {
+jspCtxt = "_jspx_page_context";
+}
 //if the attribute var has been specified then assign the result to 
the var;
 if(hasVar){
-String jspCtxt = null;
-if (ctxt.isTagFile()) {
-jspCtxt = "this.getJspContext()";
-} else {
-jspCtxt = "_jspx_page_context";
-}
 String strVar = ctxt.getConstantAttribute("var");
 ctxt.generateJavaSource("if(null != " + resultName + "){");
 ctxt.generateJavaSource("" + jspCtxt + ".setAttribute(\"" + 
strVar + "\"," + resultName + "," + iScope + ");");
@@ -144,7 +144,7 @@ public class Set implements TagPlugin {
 
 //invoke the method through the reflection
 ctxt.generateJavaSource("if(" + resultName + " 
!= null){");
-ctxt.generateJavaSource("" + methodName + 
".invoke(" + targetName + ", new 
Object[]{org.apache.el.lang.ELSupport.coerceToType(" + resultName + ", " + 
methodName + ".getParameterTypes()[0])});");
+ctxt.generateJavaSource("" + methodName + 
".invoke(" + targetName + ", new 
Object[]{org.apache.el.lang.ELSupport.coerceToType(" + jspCtxt + 
".getELContext(), " + resultName + ", " + methodName + 
".getParameterTypes()[0])});");
 ctxt.generateJavaSource("}else{");
 ctxt.generateJavaSource("" + methodName + 
".invoke(" + targetName + ", new Object[]{null});");
 ctxt.generateJavaSource("}");



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