Re: svn commit: r1804040 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/changelog.xml

2017-08-03 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 8/3/17 3:32 PM, ma...@apache.org wrote:
> Author: markt Date: Thu Aug  3 19:32:43 2017 New Revision: 1804040
> 
> URL: http://svn.apache.org/viewvc?rev=1804040&view=rev Log: If an
> invalid option is specified for the certificateVerification
> attribute of an SSLHostConfig element, treat it as required which
> is the most secure / restrictive option in addition to reporting
> the configuration error.

+1

I like this.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZg3utAAoJEBzwKT+lPKRY13sQAKNUcISXlGtf7R1d8WLAsVyQ
/nVsG0Zt5HSA0WJQOI3Cd5Hvnwu96p8Li0xN0hI5O9QZ/QQrvXnrHK0ti7ziC8f4
/ai789DZ6BGo5C/k8UfX4mrS18RXN0JafufQ5jVV+t2Zg45mXwekTgau2poSJQ5J
pyh5c1rWoLIcsdi0kaThTvkeeA5dIJM3uh2hylDYnHecffhx8kLH7iMeOfxBoWSm
Qb5viZEK/t02DCtKM3ZspqfPKhnWvfsNcCeVyDl/A1AfJUf8MH/VEBTkgiZ2jBJS
YIJpfJk461rw9fGLFbaVW9FR1vmNppegWZzGkd5Dy+1S4/zG3hIcMldK4Vquse1J
tEznMr8j6UU0tr5iT3AMJfQiQQyk9cyVoLEtdqR7PbPrTDCKPN1fL02nMblVzVia
GhO7B2Iv755u9/YNfgwKJ9dJmkJ09yHnOCm3gCK410ZPPFMSlktjojc9LSWYrmU8
qPIU6WY2095vzJM2VpxjVeyCFrHAnlrWtVRJejinDDVTIF0Dm4ZGWa27wtwqRWRS
hxtQkwINSg5fZ1ThG3zD1Oi86sGbJWLHfXo328JB8kLJvRICGTXVLEdOtkDDAAfq
UOJYtwzR5Ld+pfPuUmc0Pl5Ge5w5AmwjCINFObfo01PtPO18lM83ZOkrFD9hP7wr
UCH9w98NMFsMCo/1Z4ej
=Q2No
-END PGP SIGNATURE-

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

svn commit: r1804042 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/changelog.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 19:38:29 2017
New Revision: 1804042

URL: http://svn.apache.org/viewvc?rev=1804042&view=rev
Log:
If an invalid option is specified for the certificateVerification attribute of 
an SSLHostConfig element, treat it as required which is the most secure / 
restrictive option in addition to reporting the configuration error.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  3 19:38:29 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 
536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1
 
756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277

svn commit: r1804041 - in /tomcat/tc8.5.x/trunk: ./ build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 19:34:14 2017
New Revision: 1804041

URL: http://svn.apache.org/viewvc?rev=1804041&view=rev
Log:
Increment version for next dev cycle

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/build.properties.default
tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  3 19:34:14 2017
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
 
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747
 
536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1
 
756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216
 
8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,17

svn commit: r1804040 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SSLHostConfig.java webapps/docs/changelog.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 19:32:43 2017
New Revision: 1804040

URL: http://svn.apache.org/viewvc?rev=1804040&view=rev
Log:
If an invalid option is specified for the certificateVerification attribute of 
an SSLHostConfig element, treat it as required which is the most secure / 
restrictive option in addition to reporting the configuration error.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1804040&r1=1804039&r2=1804040&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Thu Aug  3 
19:32:43 2017
@@ -274,7 +274,15 @@ public class SSLHostConfig implements Se
 
 
 public void setCertificateVerification(String certificateVerification) {
-this.certificateVerification = 
CertificateVerification.fromString(certificateVerification);
+try {
+this.certificateVerification =
+
CertificateVerification.fromString(certificateVerification);
+} catch (IllegalArgumentException iae) {
+// If the specified value is not recognised, default to the
+// strictest possible option.
+this.certificateVerification = CertificateVerification.REQUIRED;
+throw iae;
+}
 }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1804040&r1=1804039&r2=1804040&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug  3 19:32:43 2017
@@ -45,6 +45,17 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+If an invalid option is specified for the
+certificateVerification attribute of an
+SSLHostConfig element, treat it as required
+which is the most secure / restrictive option in addition to reporting
+the configuration error. (markt)
+  
+
+  
 
 
   



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

Re: Security warning (minor) on Tomcat site when using HTTPS

2017-08-03 Thread Mark Thomas 
On 03/08/17 18:29, Christopher Schultz wrote:
> All,
> 
> If you use https://tomcat.apache.org you'll see a security warning in
> various browsers due to mixed-content.
> 
> The problem is that the "Support Apache" logo in the upper right-hand
> corner of the page is served via HTTP instead of HTTPS.
> 
> The other images on the page come from tomcat.apache.org, and are
> referenced using relative paths, so they inherit the protocol from the
> parent page.
> 
> The Support Apache logo comes from www.apache.org and can't be a
> relative link.
> 
> I'd like to fix this issue, and there are two possible approaches:
> 
> 1. Always use HTTPS: just change the link protocol to https://
> 
> 2. Use a protocol-relative link[1], whose use has been ... discouraged[2
> ]
> 
> Does anyone care one way or the other?

Option 1 works for me.

Mark

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

Re: Security warning (minor) on Tomcat site when using HTTPS

2017-08-03 Thread Igal @ Lucee.org 

On 8/3/2017 10:29 AM, Christopher Schultz wrote:

I'd like to fix this issue, and there are two possible approaches:

1. Always use HTTPS: just change the link protocol to https://
Always use HTTPS seems like the right way to me.  What's the downside?  
Latency on the first request?


TBH, best practice is to make all requests to http://tomcat.apache.org/ 
to redirect to https://tomcat.apache.org/ so if you do that you do not 
have to worry about protocol-relative URLs because they will always be 
https.  My $0.02.


Igal Sapir
Lucee Core Developer
Lucee.org

Security warning (minor) on Tomcat site when using HTTPS

2017-08-03 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

If you use https://tomcat.apache.org you'll see a security warning in
various browsers due to mixed-content.

The problem is that the "Support Apache" logo in the upper right-hand
corner of the page is served via HTTP instead of HTTPS.

The other images on the page come from tomcat.apache.org, and are
referenced using relative paths, so they inherit the protocol from the
parent page.

The Support Apache logo comes from www.apache.org and can't be a
relative link.

I'd like to fix this issue, and there are two possible approaches:

1. Always use HTTPS: just change the link protocol to https://

2. Use a protocol-relative link[1], whose use has been ... discouraged[2
]

Does anyone care one way or the other?

Thanks,
- -chris

[1] https://www.paulirish.com/2010/the-protocol-relative-url/
[2] ibid.
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJZg11+AAoJEBzwKT+lPKRY58AP/jWpdAtQ5OPWHmVZeQJqFeRm
4IYoQU3q7UAS+KYeUbfdfFE3f3OUO1BvZ1Ewqgf3SBtFcobtk+aeajhcWhCoijZ2
F+sA/9cvWFE9X8njNr3B+Z53apnS7x7Qlo/VZwT/kYwV2iZs2NhXlEzuhzVg37se
xJ304BPMmDuJgCsjIOt9MG+sBimZ0HPloqhYaZViUO/iNDA+MpNRiUVnZ6Rfo1D2
dBRDTpQqF8jpNaA7nXkHeea+ghpyK2NQ5HW3c1+rLO1hCUTrSuOuQBEDzMB0kt7p
lij2W3a2HIbsd/n4w9cT+mWdJxby/MCfcvjD2r8A83Z36KJWRzCGusiNcN00MJUl
+GegW9YTUMHtrphSvbv69JrqI/9BpM+jhFaz2lTmbDUaEGWvhZsNeKyK8X9/97gF
tJH5kdzHxDEj0fNsURYb66gtSgcL+dT8sPx+CMi8SkN6D2Zwk4YJtkdLBk4rguKq
JPM3H+8uFsK4cVHmiPHRlfsup+TcQxEQ7y/7oas7Q8Dc9KXE5EHf+fbTonwEfQFe
mFaok/qVrcZI3VHz1JQ9zkGwplsXDz2Ha/oyhFFGye0XPi+K5byISOq3t4csGuTg
FwAttYD1fvlhA8/N2/ytSBVF9JPRyOtH5DlAwPb5lb4/UKEPDEhx8bD7kmc4weLA
SHtI7btvU7VoJDqYZ5sS
=jX2Z
-END PGP SIGNATURE-

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

svn commit: r1804001 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 14:09:08 2017
New Revision: 1804001

URL: http://svn.apache.org/viewvc?rev=1804001&view=rev
Log:
Add details of Leon's MoSKito webinar

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

Modified: tomcat/site/trunk/docs/presentations.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1804001&r1=1804000&r2=1804001&view=diff
==
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Thu Aug  3 14:09:08 2017
@@ -216,7 +216,19 @@ presentations then please do let us know
 Scheduled presentations
 
 
-To be confirmed.
+
+Tomcat and MoSKito (Leon Rosenburg)
+
+Monitoring your tomcat web-application in production with MoSKito. Get full
+control of threads, memory and execution time usage of the JVM and your
+code.
+
+
+  
+Webinar: Thursday 24th August 2017 https://pivotal.zoom.us/j/949439493";>14.00 UTC
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/presentations.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1804001&r1=1804000&r2=1804001&view=diff
==
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Thu Aug  3 14:09:08 2017
@@ -16,7 +16,13 @@ presentations then please do let us know
 Tomcat Users mailing list.
 
 
-To be confirmed.
+Tomcat and MoSKito (Leon Rosenburg)
+Monitoring your tomcat web-application in production with MoSKito. Get full
+control of threads, memory and execution time usage of the JVM and your
+code.
+
+  Webinar: Thursday 24th August 2017 https://pivotal.zoom.us/j/949439493";>14.00 UTC
+
 
 
 



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

svn commit: r1803999 - in /tomcat/site/trunk: docs/conference.html xdocs/conference.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 13:59:43 2017
New Revision: 1803999

URL: http://svn.apache.org/viewvc?rev=1803999&view=rev
Log:
Start to put together the details of TomcatCon London

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

Modified: tomcat/site/trunk/docs/conference.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1803999&r1=1803998&r2=1803999&view=diff
==
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Thu Aug  3 13:59:43 2017
@@ -210,7 +210,7 @@
 
 
 
-May 16 to May 18 2017. 
+26 September 2017 
 
 
 
@@ -222,7 +222,7 @@
 
 
 
-Intercontinental Miami, Miami, Florida, alongside ApacheCon NA 2017. 
+Hilton Doubletree, Westminster, London, UK 
 
 
 
@@ -234,17 +234,15 @@
 
 
 
-TomcatCon is the place for all users of Tomcat to expand their Tomcat
+TomcatCon London is the place for all users of Tomcat to expand their Tomcat
knowledge in areas such as networking, security, performance and deployment.
It also offers an opportunity to discuss the current Tomcat roadmap and
help inform future development.
 
 
 
-http://events.linuxfoundation.org/events/apachecon-north-america/attend/register-";>Registration
-   for TomcatCon is open.
-   Registration includes access to ApacheCon and the other co-located Apache
-   conferences.
+Registration
+   for TomcatCon London is now open.
 
 
 
@@ -256,29 +254,60 @@
 
 
 
-The full https://apachecon2017.sched.com/overview/type/TomcatCon";>schedule
-   is now available. The Tomcat team is pleased to be able to say that the 
final
-   schedule has three days of great content covering all the key topics
-   identified by the community including:
-   
 
- 
-security
- 
-networking (reverse proxying, load-balancing, clustering)
- 
-performance and monitoring
- 
-reactive applications
- 
-microservices and cloud
-   
+
+08.00 Registration and Breakfast
+
+09.00 Welcome
+TODO: Short description
+
+09.20 State of the Cat
+A review of the past year or so for Apache Tomcat and a look forward to 
what
+is expected in the coming 12 months. In particular, this will include the
+progress of Tomcat 9 towards its first stable release.
+
+10.20 New and upcoming
+TODO: Short description
+
+11.20 Break
+
+11.40 Proxies, Load-balancing & Clustering Part 1
+TODO: Short description
+
+12.40 Lunch
+
+13.40 Proxies, Load-balancing & Clustering Part 2
+TODO: Short description
+
+14.40 Fault Finding and Diagnostics
+TODO: Short description
+
+15.40 Break
+
+16.00 Ask Us Anything
+TODO: Short description
+
 
 
+
 See you there!
 
 
 
+
+
+
+Previous events
+
+
+
+Slides along with audio and video (where available) from previous events are
+   available from the previous presentations
+   page.
+   
+
+
+
 
 
 

Modified: tomcat/site/trunk/xdocs/conference.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1803999&r1=1803998&r2=1803999&view=diff
==
--- tomcat/site/trunk/xdocs/conference.xml (original)
+++ tomcat/site/trunk/xdocs/conference.xml Thu Aug  3 13:59:43 2017
@@ -11,46 +11,64 @@
 
 
 
-May 16 to May 18 2017. 
+26 September 2017 
 
 
 
 
 
-Intercontinental Miami, Miami, Florida, alongside ApacheCon NA 2017. 
+Hilton Doubletree, Westminster, London, UK 
 
 
 
 
 
-TomcatCon is the place for all users of Tomcat to expand their Tomcat
+TomcatCon London is the place for all users of Tomcat to expand their Tomcat
knowledge in areas such as networking, security, performance and deployment.
It also offers an opportunity to discuss the current Tomcat roadmap and
help inform future development.
 
-http://events.linuxfoundation.org/events/apachecon-north-america/attend/register-";>Registration
-   for TomcatCon is open.
-   Registration includes access to ApacheCon and the other co-located Apache
-   conferences.
+Registration
+   for TomcatCon London is now open.
 
 
 
 
 
-The full https://apachecon2017.sched.com/overview/type/TomcatCon";>schedule
-   is now available. The Tomcat team is pleased to be able to say that the 
final
-   schedule has three days of great content covering all the key topics
-   identified by the community including:
-   
- security
- networking (reverse proxying, load-balancing, clustering)
- performance and monitoring
- reactive applications
- microservices and cloud
-   
+
+08.00 Registration and Breakfast
+09.00 Welcome
+TODO: Short description
+09.20 State of the Cat
+A review of the past year or so for Apache Tomcat and a look forward to 
what
+is expected in the coming 12 months. In particular, this will include the
+progress of Tomcat 9 towards its first stable release.
+10.20 New and upcoming
+TODO: Short description
+11.20 Break

[Bug 51463] Tomcat.setBaseDir (package org.apache.catalina.startup) should use temp directory as default instead of current directory

2017-08-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=51463

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #5 from Mark Thomas  ---
Coming back to this a major version later than I intended to, the
cross-platform capabilities to set permissions for directories aren't what we
need to set them reliably.

I've improved the validation of the baseDir for Tomcat 9 but I think that is as
far as I can go.

-- 
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: r1803996 - in /tomcat/trunk/java/org/apache/catalina/startup: LocalStrings.properties Tomcat.java

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 13:39:55 2017
New Revision: 1803996

URL: http://svn.apache.org/viewvc?rev=1803996&view=rev
Log:
Add some basic checks for the baseDir
Clearer Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1803996&r1=1803995&r2=1803996&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Thu 
Aug  3 13:39:55 2017
@@ -124,6 +124,8 @@ hostConfig.undeploy=Undeploying context
 hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}] 
since [{1}] is not absolute
 hostConfig.undeployVersion=Undeploying old version of context [{0}] which has 
no active session
 passwdUserDatabase.readFail=Failed to obtain a complete set of users from 
/etc/passwd
+tomcat.baseDirNotDir=The location [{0}] specified for the base directory is 
not a directory
+tomcat.baseDirMakeFail=Unable to create the directory [{0}] to use as the base 
directory
 userConfig.database=Exception loading user database
 userConfig.deploy=Deploying web application for user [{0}]
 userConfig.deploying=Deploying user web applications

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1803996&r1=1803995&r2=1803996&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Aug  3 
13:39:55 2017
@@ -64,6 +64,7 @@ import org.apache.catalina.realm.RealmBa
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.descriptor.web.LoginConfig;
+import org.apache.tomcat.util.res.StringManager;
 
 // TODO: lazy init for the temp dir - only when a JSP is compiled or
 // get temp dir is called we need to create it. This will avoid the
@@ -138,6 +139,9 @@ import org.apache.tomcat.util.descriptor
  * @author Costin Manolache
  */
 public class Tomcat {
+
+private static final StringManager sm = 
StringManager.getManager(Tomcat.class);
+
 // Some logging implementations use weak references for loggers so there is
 // the possibility that logging configuration could be lost if GC runs just
 // after Loggers are configured but before they are used. The purpose of
@@ -160,22 +164,26 @@ public class Tomcat {
 }
 
 /**
- * Tomcat needs a directory for temp files. This should be the
- * first method called.
- *
+ * Tomcat requires that the base directory is set because the defaults for
+ * a number of other locations, such as the work directory, are derived 
from
+ * the base directory. This should be the first method called.
  * 
- * By default, if this method is not called, we use:
- * 
- *  system properties - catalina.base, catalina.home
- *  [user.dir]/tomcat.$PORT
- * 
- * (/tmp doesn't seem a good choice for security).
- *
+ * If this method is not called then Tomcat will attempt to use these
+ * locations in the following order:
+ * 
+ *  if set, the catalina.base system property
+ *  if set, the catalina.home system property
+ *  The user.dir system property (the directory where Java was run 
from)
+ *  where a directory named tomcat.$PORT will be created. $PORT is the
+ *  value configured via {@link #setPort(int)} which defaults to 8080 
if
+ *  not set
+ * 
+ * The user should ensure that the file permissions for the base directory
+ * are appropriate.
  * 
  * TODO: disable work dir if not needed ( no jsp, etc ).
  *
- * @param basedir The Tomcat base folder on which all others
- *  will be derived
+ * @param basedir The Tomcat base folder on which all others will be 
derived
  */
 public void setBaseDir(String basedir) {
 this.basedir = basedir;
@@ -704,12 +712,27 @@ public class Tomcat {
 }
 if (basedir == null) {
 // Create a temp dir.
-basedir = System.getProperty("user.dir") +
-"/tomcat." + port;
+basedir = System.getProperty("user.dir") + "/tomcat." + port;
 }
 
 File baseFile = new File(basedir);
-baseFile.mkdirs();
+if (baseFile.exists()) {
+if (!baseFile.isDirectory()) {
+throw new 
IllegalArgumentException(sm.getString("tomcat.baseDirNotDir", baseFile));
+}
+} else {
+

svn commit: r20744 - in /dev/tomcat/tomcat-8/v8.5.20: README.html bin/README.html

2017-08-03 Thread kkolinko 
Author: kkolinko
Date: Thu Aug  3 11:26:45 2017
New Revision: 20744

Log:
Remove references to JULI JARs that are no longer included

This applies r1803957 to release candidate. For published release this was 
applied in r20741.

Modified:
dev/tomcat/tomcat-8/v8.5.20/README.html
dev/tomcat/tomcat-8/v8.5.20/bin/README.html

Modified: dev/tomcat/tomcat-8/v8.5.20/README.html
==
--- dev/tomcat/tomcat-8/v8.5.20/README.html (original)
+++ dev/tomcat/tomcat-8/v8.5.20/README.html Thu Aug  3 11:26:45 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-8.5-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-8.5-doc/extras.html";>

Modified: dev/tomcat/tomcat-8/v8.5.20/bin/README.html
==
--- dev/tomcat/tomcat-8/v8.5.20/bin/README.html (original)
+++ dev/tomcat/tomcat-8/v8.5.20/bin/README.html Thu Aug  3 11:26:45 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-8.5-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-8.5-doc/extras.html";>



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

Re: svn commit: r1803929 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-08-03 Thread Rainer Jung 

Am 03.08.2017 um 10:31 schrieb Mark Thomas:

On 03/08/17 06:44, Rainer Jung wrote:

Am 02.08.2017 um 23:33 schrieb ma...@apache.org:

Author: markt
Date: Wed Aug  2 21:33:52 2017
New Revision: 1803929

URL: http://svn.apache.org/viewvc?rev=1803929&view=rev
Log:
Add release date

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

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1803929&r1=1803928&r2=1803929&view=diff

==

--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug  2
21:33:52 2017
@@ -111,7 +111,7 @@
 
   
 
-
+
   
 
   


Since you plan to not announce 8.5.19, should we switch this to "not
released"?


I thought about that but it was released to Maven Central and the
mirrors. That means it will also appear in the archives.

On balance, I thought it would be less confusing to have the date there.


Understood, thanks for the clarification.

Rainer


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

svn commit: r1803975 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:48:28 2017
New Revision: 1803975

URL: http://svn.apache.org/viewvc?rev=1803975&view=rev
Log:
Correct Javadoc

Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1803975&r1=1803974&r2=1803975&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Aug  
3 09:48:28 2017
@@ -168,7 +168,7 @@ public class Tomcat {
  * By default, if this method is not called, we use:
  * 
  *  system properties - catalina.base, catalina.home
- *  $PWD/tomcat.$PORT
+ *  [user.dir]/tomcat.$PORT
  * 
  * (/tmp doesn't seem a good choice for security).
  *



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

svn commit: r1803972 - /tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:36:44 2017
New Revision: 1803972

URL: http://svn.apache.org/viewvc?rev=1803972&view=rev
Log:
Correct Javadoc

Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1803972&r1=1803971&r2=1803972&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Aug  3 
09:36:44 2017
@@ -167,7 +167,7 @@ public class Tomcat {
  * By default, if this method is not called, we use:
  * 
  *  system properties - catalina.base, catalina.home
- *  $PWD/tomcat.$PORT
+ *  [user.dir]/tomcat.$PORT
  * 
  * (/tmp doesn't seem a good choice for security).
  *



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

svn commit: r1803968 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:17:27 2017
New Revision: 1803968

URL: http://svn.apache.org/viewvc?rev=1803968&view=rev
Log:
Recommend Tomcat 7 as a minimum for all users of unsupported versions.

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

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803968&r1=1803967&r2=1803968&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Aug  3 09:17:27 2017
@@ -597,7 +597,7 @@ it in production
 
 Users of Tomcat 5 should be aware that Tomcat 5 has now reached
 end of life. Users of Tomcat 5.x should
-upgrade to Tomcat 6.x or later.
+upgrade to Tomcat 7.x or later.
 
 
 
@@ -653,7 +653,7 @@ specifications with no changes.
 
 
 Users of Tomcat 4 should be aware that Tomcat 4 has now reached
-end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or
 later.
 
 
@@ -727,7 +727,7 @@ strongly encouraged to migrate to the cu
 
 
 Users of Tomcat 3 should be aware that Tomcat 3 has now reached
-end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or
 later.
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803968&r1=1803967&r2=1803968&view=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Aug  3 09:17:27 2017
@@ -301,7 +301,7 @@ it in production
 
 Users of Tomcat 5 should be aware that Tomcat 5 has now reached
 end of life. Users of Tomcat 5.x should
-upgrade to Tomcat 6.x or later.
+upgrade to Tomcat 7.x or later.
 
 
 
@@ -338,7 +338,7 @@ also supports web applications built for
 specifications with no changes.
 
 Users of Tomcat 4 should be aware that Tomcat 4 has now reached
-end of life. Users of Tomcat 4.x should upgrade to Tomcat 5.x or
+end of life. Users of Tomcat 4.x should upgrade to Tomcat 7.x or
 later.
 
 
@@ -394,7 +394,7 @@ strongly encouraged to migrate to the cu
 Apache Tomcat 3.0.x. Initial Apache Tomcat release.
 
 Users of Tomcat 3 should be aware that Tomcat 3 has now reached
-end of life. Users of Tomcat 3.x should upgrade to Tomcat 4.x or
+end of life. Users of Tomcat 3.x should upgrade to Tomcat 7.x or
 later.
 
 



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

svn commit: r1803967 - in /tomcat/site/trunk: docs/sitemap-main.xml xdocs/sitemap-main.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:15:45 2017
New Revision: 1803967

URL: http://svn.apache.org/viewvc?rev=1803967&view=rev
Log:
Drop Tomcat 6 docs from the sitemap

Modified:
tomcat/site/trunk/docs/sitemap-main.xml
tomcat/site/trunk/xdocs/sitemap-main.xml

Modified: tomcat/site/trunk/docs/sitemap-main.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/sitemap-main.xml?rev=1803967&r1=1803966&r2=1803967&view=diff
==
--- tomcat/site/trunk/docs/sitemap-main.xml (original)
+++ tomcat/site/trunk/docs/sitemap-main.xml Thu Aug  3 09:15:45 2017
@@ -37,11 +37,6 @@
 0.7
   
   
-http://tomcat.apache.org/tomcat-6.0-doc/
-monthly
-0.5
-  
-  
 http://tomcat.apache.org/taglibs/
 monthly
 0.6

Modified: tomcat/site/trunk/xdocs/sitemap-main.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/sitemap-main.xml?rev=1803967&r1=1803966&r2=1803967&view=diff
==
--- tomcat/site/trunk/xdocs/sitemap-main.xml (original)
+++ tomcat/site/trunk/xdocs/sitemap-main.xml Thu Aug  3 09:15:45 2017
@@ -37,11 +37,6 @@
 0.7
   
   
-http://tomcat.apache.org/tomcat-6.0-doc/
-monthly
-0.5
-  
-  
 http://tomcat.apache.org/taglibs/
 monthly
 0.6



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

svn commit: r1803966 - in /tomcat/site/trunk: docs/doap_Tomcat.rdf xdocs/doap_Tomcat.rdf

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:15:17 2017
New Revision: 1803966

URL: http://svn.apache.org/viewvc?rev=1803966&view=rev
Log:
Remove Tomcat 6 (and Servlet 2.5) from the doap file

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/doap_Tomcat.rdf

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1803966&r1=1803965&r2=1803966&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Aug  3 09:15:17 2017
@@ -78,13 +78,6 @@
 7.0.79
   
 
-
-  
-Latest Stable 6.0.x Release
-2017-04-07
-6.0.53
-  
-
 
   
 http://svn.apache.org/repos/asf/tomcat"/>
@@ -132,14 +125,6 @@
 http://www.jcp.org/en/jsr/detail?id=315"/>
   
 
-
-  
-Java Servlet 2.5
-JCP
-JSR 154
-http://www.jcp.org/en/jsr/detail?id=154"/>
-  
-
   
 
 

Modified: tomcat/site/trunk/xdocs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/doap_Tomcat.rdf?rev=1803966&r1=1803965&r2=1803966&view=diff
==
--- tomcat/site/trunk/xdocs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/xdocs/doap_Tomcat.rdf Thu Aug  3 09:15:17 2017
@@ -78,13 +78,6 @@
 7.0.79
   
 
-
-  
-Latest Stable 6.0.x Release
-2017-04-07
-6.0.53
-  
-
 
   
 http://svn.apache.org/repos/asf/tomcat"/>
@@ -132,14 +125,6 @@
 http://www.jcp.org/en/jsr/detail?id=315"/>
   
 
-
-  
-Java Servlet 2.5
-JCP
-JSR 154
-http://www.jcp.org/en/jsr/detail?id=154"/>
-  
-
   
 
 



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

svn commit: r1803965 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:14:36 2017
New Revision: 1803965

URL: http://svn.apache.org/viewvc?rev=1803965&view=rev
Log:
Mark Tomcat 6 as archived

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

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1803965&r1=1803964&r2=1803965&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Aug  3 09:14:36 2017
@@ -294,8 +294,8 @@ mapping between the specifications and t
   2.1
   N/A
   N/A
-  6.0.x
-  6.0.53
+  6.0.x (archived)
+  6.0.53 (archived)
   5 and later
 
 

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1803965&r1=1803964&r2=1803965&view=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Aug  3 09:14:36 2017
@@ -80,8 +80,8 @@ mapping between the specifications and t
   2.1
   N/A
   N/A
-  6.0.x
-  6.0.53
+  6.0.x (archived)
+  6.0.53 (archived)
   5 and later
 
 



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

svn commit: r1803964 - in /tomcat/site/trunk: docs/security.html xdocs/security.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:14:09 2017
New Revision: 1803964

URL: http://svn.apache.org/viewvc?rev=1803964&view=rev
Log:
Move link to Tomcat 6 security issues into the archives section

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

Modified: tomcat/site/trunk/docs/security.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1803964&r1=1803963&r2=1803964&view=diff
==
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Thu Aug  3 09:14:09 2017
@@ -242,11 +242,6 @@
 
   
 
-Apache Tomcat 6.x Security Vulnerabilities
-  
-
-  
-
 Apache Tomcat JK Connectors Security
   Vulnerabilities
 
@@ -270,6 +265,11 @@
 
   
 
+Apache Tomcat 6.x Security Vulnerabilities
+  
+
+  
+
 Apache Tomcat 5.x Security Vulnerabilities
   
 

Modified: tomcat/site/trunk/xdocs/security.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security.xml?rev=1803964&r1=1803963&r2=1803964&view=diff
==
--- tomcat/site/trunk/xdocs/security.xml (original)
+++ tomcat/site/trunk/xdocs/security.xml Thu Aug  3 09:14:09 2017
@@ -31,8 +31,6 @@
   
   Apache Tomcat 7.x Security Vulnerabilities
   
-  Apache Tomcat 6.x Security Vulnerabilities
-  
   Apache Tomcat JK Connectors Security
   Vulnerabilities
   Apache Tomcat APR/native Connector
@@ -44,6 +42,8 @@
 Lists of security problems fixed in versions of Apache Tomcat that may
 be downloaded from the archives are also available:
 
+  Apache Tomcat 6.x Security Vulnerabilities
+  
   Apache Tomcat 5.x Security Vulnerabilities
   
   Apache Tomcat 4.x Security Vulnerabilities



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

svn commit: r1803962 - in /tomcat/site/trunk: docs/download-60.cgi docs/download-60.html xdocs/download-60.cgi xdocs/download-60.xml

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:04:28 2017
New Revision: 1803962

URL: http://svn.apache.org/viewvc?rev=1803962&view=rev
Log:
Remove the 6.0.x download pages

Removed:
tomcat/site/trunk/docs/download-60.cgi
tomcat/site/trunk/docs/download-60.html
tomcat/site/trunk/xdocs/download-60.cgi
tomcat/site/trunk/xdocs/download-60.xml


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

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

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 09:02:45 2017
New Revision: 1803961

URL: http://svn.apache.org/viewvc?rev=1803961&view=rev
Log:
Remove 6.0.x entry now it has been moved to our archive

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

Modified: tomcat/site/trunk/docs/svn.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/svn.html?rev=1803961&r1=1803960&r2=1803961&view=diff
==
--- tomcat/site/trunk/docs/svn.html (original)
+++ tomcat/site/trunk/docs/svn.html Thu Aug  3 09:02:45 2017
@@ -337,16 +337,6 @@ http://svn.apache.org/repos/asf/tomcat
 
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x";>
-/tc6.0.x/
-The stable Tomcat 6.0.x release branch. See
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";>
-/tc6.0.x/trunk/.
-  
-
-  
-
-
 http://svn.apache.org/repos/asf/tomcat/tc7.0.x";>
 /tc7.0.x/
 The stable Tomcat 7.0.x release branch. See

Modified: tomcat/site/trunk/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/svn.xml?rev=1803961&r1=1803960&r2=1803961&view=diff
==
--- tomcat/site/trunk/xdocs/svn.xml (original)
+++ tomcat/site/trunk/xdocs/svn.xml Thu Aug  3 09:02:45 2017
@@ -88,13 +88,6 @@ http://svn.apache.org/repos/asf/tomcatTags for the primary development branch. Mainly used for modules.
   
   
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x";>
-/tc6.0.x/
-The stable Tomcat 6.0.x release branch. See
-http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk";>
-/tc6.0.x/trunk/.
-  
-  
 http://svn.apache.org/repos/asf/tomcat/tc7.0.x";>
 /tc7.0.x/
 The stable Tomcat 7.0.x release branch. See



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

svn commit: r1803960 - in /tomcat: archive/tc6.0.x/ tc6.0.x/

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 08:59:53 2017
New Revision: 1803960

URL: http://svn.apache.org/viewvc?rev=1803960&view=rev
Log:
Move 6.0.x to the archive area

Added:
tomcat/archive/tc6.0.x/
  - copied from r1803959, tomcat/tc6.0.x/
Removed:
tomcat/tc6.0.x/


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

svn commit: r20743 - /release/tomcat/tomcat-6/

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 08:57:25 2017
New Revision: 20743

Log:
Remove Tomcat 6 from mirror system

Removed:
release/tomcat/tomcat-6/


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

Re: svn commit: r1803929 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

2017-08-03 Thread Mark Thomas 
On 03/08/17 06:44, Rainer Jung wrote:
> Am 02.08.2017 um 23:33 schrieb ma...@apache.org:
>> Author: markt
>> Date: Wed Aug  2 21:33:52 2017
>> New Revision: 1803929
>>
>> URL: http://svn.apache.org/viewvc?rev=1803929&view=rev
>> Log:
>> Add release date
>>
>> Modified:
>> tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
>>
>> Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1803929&r1=1803928&r2=1803929&view=diff
>>
>> ==
>>
>> --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug  2
>> 21:33:52 2017
>> @@ -111,7 +111,7 @@
>>  
>>
>>  
>> -
>> +
>>
>>  
>>
> 
> Since you plan to not announce 8.5.19, should we switch this to "not
> released"?

I thought about that but it was released to Maven Central and the
mirrors. That means it will also appear in the archives.

On balance, I thought it would be less confusing to have the date there.

Mark

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

[Bug 57767] Websocket client proprietary configuration

2017-08-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

Mark Thomas  changed:

   What|Removed |Added

 CC|ma...@apache.org|

-- 
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: r20741 - in /release/tomcat/tomcat-8/v8.5.16: README.html bin/README.html

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 07:53:09 2017
New Revision: 20741

Log:
Remove references to JULI JARs that are no longer included

Modified:
release/tomcat/tomcat-8/v8.5.16/README.html
release/tomcat/tomcat-8/v8.5.16/bin/README.html

Modified: release/tomcat/tomcat-8/v8.5.16/README.html
==
--- release/tomcat/tomcat-8/v8.5.16/README.html (original)
+++ release/tomcat/tomcat-8/v8.5.16/README.html Thu Aug  3 07:53:09 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-8.5-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-8.5-doc/extras.html";>

Modified: release/tomcat/tomcat-8/v8.5.16/bin/README.html
==
--- release/tomcat/tomcat-8/v8.5.16/bin/README.html (original)
+++ release/tomcat/tomcat-8/v8.5.16/bin/README.html Thu Aug  3 07:53:09 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-8.5-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-8.5-doc/extras.html";>



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

[Bug 58588] Remove extras/juli from Tomcat 9 build and deliveries as Log4J 1.x has reached EOL.

2017-08-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58588

Mark Thomas  changed:

   What|Removed |Added

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

--- Comment #5 from Mark Thomas  ---
Dan,

Thanks for the report. The content of the READMEs has been updated for 8.5.21
onwards. I'll update the current release manually and try and remember to do
the same for 8.5.20.


Guillermo,

If you are having difficulties with using Log4J2, the users list is the place
to seek help. If a specific feature is identified as missing then a Bugzilla
enhancement request can be opened if appropriate.

-- 
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: r1803957 - in /tomcat/tc8.5.x/trunk/res: welcome.bin.html welcome.main.html

2017-08-03 Thread markt 
Author: markt
Date: Thu Aug  3 07:44:56 2017
New Revision: 1803957

URL: http://svn.apache.org/viewvc?rev=1803957&view=rev
Log:
Follow up to https://bz.apache.org/bugzilla/show_bug.cgi?id=58588
Remove references to tomcat-juli-adapters.jar since it is no longer distributed.

Modified:
tomcat/tc8.5.x/trunk/res/welcome.bin.html
tomcat/tc8.5.x/trunk/res/welcome.main.html

Modified: tomcat/tc8.5.x/trunk/res/welcome.bin.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/welcome.bin.html?rev=1803957&r1=1803956&r2=1803957&view=diff
==
--- tomcat/tc8.5.x/trunk/res/welcome.bin.html (original)
+++ tomcat/tc8.5.x/trunk/res/welcome.bin.html Thu Aug  3 07:44:56 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>

Modified: tomcat/tc8.5.x/trunk/res/welcome.main.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/welcome.main.html?rev=1803957&r1=1803956&r2=1803957&view=diff
==
--- tomcat/tc8.5.x/trunk/res/welcome.main.html (original)
+++ tomcat/tc8.5.x/trunk/res/welcome.main.html Thu Aug  3 07:44:56 2017
@@ -73,10 +73,6 @@ RELEASE-NOTES and the RUNNING.txt file i
 
 bin/extras/
 
-  tomcat-juli-adapters.jar & tomcat-juli.jar
-Full commons-logging implementation. See the http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/logging.html";>
-logging documentation for more information.
   catalina-ws.jar
 Web Services support (JSR 109). See the http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html";>



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

[Bug 57767] Websocket client proprietary configuration

2017-08-03 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57767

Remy Maucherat  changed:

   What|Removed |Added

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

--- Comment #11 from Remy Maucherat  ---
Reopening since authentication is not done and this was for both items, and
possibly more.

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