[Bug 57815] Improve error message when OpenSSL does not support the requested highest SSLProtocol

2015-04-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57815

--- Comment #5 from Christopher Schultz ch...@christopherschultz.net ---
(In reply to Justin from comment #4)
 Thanks for your time and contributions. I would definitely find both the
 compile time and run time versions of OpenSSL helpful, at least while such
 static restrictions exist.

Okay.

 Sadly Tomcat Native is not actively maintained in many distributions, e.g.
 pulled from Fedora EPEL 6, at 1.1.30 in Fedora EPEL 7 (as of April 16,
 2015). OpenSSL will be more actively maintained, particularly for security
 concerns. Might help many to support future protocols and ciphers.

Please lobby your distribution for updates. Generally-speaking, Linux distros
try to maintain stability and will only back-port security patches, so many
improvements are ignored. There may not be a way to change that policy.

 Slightly off topic: have you or others considered alternatives to
 OpenSSL/LibreSSL? Maybe GnuTLS, NSS, Botan?

If you look at the TLS-related tcnative code, you'll notice that is is *very*
tightly coupled with the OpenSSL API. Even the Java binding exposes OpenSSL API
calls (I'm specifically thinking of the hasOp method).

LibreSSL's initial goal is library-compatibility, so using that library ought
to be relatively easy to do. The others, not so much.

If you'd be interested in taking a look at how to implement some of the native
functions that are currently implemented as OpenSSL-only, except with GnuTLS,
etc., I'd certainly be interested in seeing them.

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

2015-04-17 Thread rjung 
Author: rjung
Date: Fri Apr 17 07:01:58 2015
New Revision: 1674221

URL: http://svn.apache.org/r1674221
Log:
Remove trailing whitespace.

Backport of r1674220 from tc8 plus one
more cleanup not necessary in tc8.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 07:01:58 2015
@@ -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,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432
 
,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759
+/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,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432
 
,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220
 
/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

buildbot exception in ASF Buildbot on tomcat-7-trunk

2015-04-17 Thread 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/624

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] 1674221
Blamelist: rjung

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




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

svn commit: r1674220 - /tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml

2015-04-17 Thread rjung 
Author: rjung
Date: Fri Apr 17 07:00:10 2015
New Revision: 1674220

URL: http://svn.apache.org/r1674220
Log:
Remove trailing whitespace.

Modified:
tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml

Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml?rev=1674220r1=1674219r2=1674220view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/cluster-manager.xml Fri Apr 17 
07:00:10 2015
@@ -137,7 +137,7 @@
   /attribute
   attribute name=recordAllActions required=false
 pFlag whether send all actions for session across Tomcat cluster
-nodes. If set to false, if already done something to the same 
attribute, 
+nodes. If set to false, if already done something to the same 
attribute,
 make sure don't send multiple actions across Tomcat cluster nodes.
 In that case, sends only the actions that have been added at last.
 Default is codefalse/code./p



-
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

2015-04-17 Thread 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,
 and has been outstanding for 6 runs.
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: 43 mins 17 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-20150417-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-trunk/dest-20150417/lib 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150417.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150417-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-1.0.2/dest-20150417/bin/openssl
 -Dexecute.test.apr=true -Dtest.excludePerformance=true 
-Dexecute.test.nio2=false 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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

svn commit: r1674295 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/security-howto.xml

2015-04-17 Thread kkolinko 
Author: kkolinko
Date: Fri Apr 17 13:04:17 2015
New Revision: 1674295

URL: http://svn.apache.org/r1674295
Log:
Correct list markup (list elements are li, not ol)

Merged r1674294 from tomcat/trunk.

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

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 13:04:17 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-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,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-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,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892

svn commit: r1674294 - /tomcat/trunk/webapps/docs/security-howto.xml

2015-04-17 Thread kkolinko 
Author: kkolinko
Date: Fri Apr 17 13:02:33 2015
New Revision: 1674294

URL: http://svn.apache.org/r1674294
Log:
Correct list markup (list elements are li, not ol)

Modified:
tomcat/trunk/webapps/docs/security-howto.xml

Modified: tomcat/trunk/webapps/docs/security-howto.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1674294r1=1674293r2=1674294view=diff
==
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Fri Apr 17 13:02:33 2015
@@ -129,15 +129,15 @@
  pWhen deploying a web application that provides management functions for
  the Tomcat instance, the following guidelines should be followed:/p
  ul
-   olEnsure that any users permitted to access the management application
-   have strong passwords./ol
-   olDo not remove the use of the a
+   liEnsure that any users permitted to access the management application
+   have strong passwords./li
+   liDo not remove the use of the a

href=config/realm.html#LockOut_Realm_-_org.apache.catalina.realm.LockOutRealmLockOutRealm/a
-   which prevents brute force attacks against user passwords./ol
-   olUncomment the a 
href=config/valve.html#Remote_Address_FilterRemoteAddrValve/a
+   which prevents brute force attacks against user passwords./li
+   liUncomment the a 
href=config/valve.html#Remote_Address_FilterRemoteAddrValve/a
in code/META-INF/context.xml/code which limits access to
localhost. If remote access is required, limit it to specific IP
-   addresses using this valve./ol
+   addresses using this valve./li
  /ul
/subsection
   /section



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

svn commit: r1674296 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/security-howto.xml

2015-04-17 Thread kkolinko 
Author: kkolinko
Date: Fri Apr 17 13:06:02 2015
New Revision: 1674296

URL: http://svn.apache.org/r1674296
Log:
Correct list markup (list elements are li, not ol)

Merged r1674295 from tomcat/tc8.0.x/trunk.

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

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 13:06:02 2015
@@ -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,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432
 
,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220
-/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

svn commit: r1674329 - /tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

2015-04-17 Thread remm 
Author: remm
Date: Fri Apr 17 14:37:31 2015
New Revision: 1674329

URL: http://svn.apache.org/r1674329
Log:
Add a very simple test that uses the new NIO 2 style IO calls.

Added:

tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

Added: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1674329view=auto
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (added)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Fri Apr 17 14:37:31 2015
@@ -0,0 +1,259 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the License); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.coyote.http11.upgrade;
+
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.net.Socket;
+import java.nio.ByteBuffer;
+import java.nio.channels.CompletionHandler;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.SocketFactory;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.WebConnection;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapperBase;
+import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+
+public class TestUpgradeInternalHandler extends TomcatBaseTest {
+
+private static final String MESSAGE = This is a test.;
+
+@Test
+public void testUpgradeInternal() throws Exception {
+Assume.assumeTrue(
+Only supported on NIO 2,
+getTomcatInstance().getConnector().getProtocol()
+
.equals(org.apache.coyote.http11.Http11Nio2Protocol));
+
+UpgradeConnection uc = doUpgrade(EchoAsync.class);
+PrintWriter pw = new PrintWriter(uc.getWriter());
+BufferedReader reader = uc.getReader();
+
+// Add extra sleep to avoid completing inline
+Thread.sleep(500);
+pw.println(MESSAGE);
+pw.flush();
+Thread.sleep(500);
+uc.shutdownOutput();
+
+// Note: BufferedReader.readLine() strips new lines
+//   ServletInputStream.readLine() does not strip new lines
+String response = reader.readLine();
+Assert.assertEquals(MESSAGE, response);
+
+uc.shutdownInput();
+}
+
+private UpgradeConnection doUpgrade(
+Class? extends HttpUpgradeHandler upgradeHandlerClass) throws 
Exception {
+// Setup Tomcat instance
+Tomcat tomcat = getTomcatInstance();
+
+// No file system docBase required
+Context ctx = tomcat.addContext(, null);
+
+UpgradeServlet servlet = new UpgradeServlet(upgradeHandlerClass);
+Tomcat.addServlet(ctx, servlet, servlet);
+ctx.addServletMapping(/, servlet);
+
+tomcat.start();
+
+// Use raw socket so the necessary control is available after the HTTP
+// upgrade
+Socket socket =
+SocketFactory.getDefault().createSocket(localhost, 
getPort());
+
+socket.setSoTimeout(5000);
+
+UpgradeConnection uc = new UpgradeConnection(socket);
+
+uc.getWriter().write(GET / HTTP/1.1 + CRLF);
+uc.getWriter().write(Host: whatever + CRLF);
+uc.getWriter().write(CRLF);
+uc.getWriter().flush();
+
+String status = uc.getReader().readLine();
+
+

svn commit: r1674330 - /tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

2015-04-17 Thread remm 
Author: remm
Date: Fri Apr 17 14:40:22 2015
New Revision: 1674330

URL: http://svn.apache.org/r1674330
Log:
Cleanup

Modified:

tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
   (contents, props changed)

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1674330r1=1674329r2=1674330view=diff
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (original)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Fri Apr 17 14:40:22 2015
@@ -16,8 +16,6 @@
  */
 package org.apache.coyote.http11.upgrade;
 
-import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,6 +37,12 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.http.HttpUpgradeHandler;
 import javax.servlet.http.WebConnection;
 
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
@@ -46,9 +50,6 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.SocketStatus;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.net.SocketWrapperBase.CompletionState;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Test;
 
 public class TestUpgradeInternalHandler extends TomcatBaseTest {
 

Propchange: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
--
svn:eol-style = native



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

[Bug 57827] New: Enable adding/removing of members via jmx in a static-membership cluster

2015-04-17 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=57827

Bug ID: 57827
   Summary: Enable adding/removing of members via jmx in a
static-membership cluster
   Product: Tomcat 7
   Version: 7.0.59
  Hardware: PC
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Cluster
  Assignee: dev@tomcat.apache.org
  Reporter: christoph.pryb...@gmail.com

When creating a cluster with static membership the number of participating
cluster-nodes sometimes is not static. 

Therefore it should be possible to add/remove members in such a
static-membership cluster without restarting the other already running tomcat
instances.

As far as I cloud tell there is currently no possibility to do that.
This would be suited as a jmx feature.

See also the mailing-list discussion

http://mail-archives.apache.org/mod_mbox/tomcat-users/201504.mbox/%3C552FC04E.1030605%40gmail.com%3E

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

buildbot exception in ASF Buildbot on tomcat-trunk

2015-04-17 Thread buildbot 
The Buildbot has detected a build exception on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/1142

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1674330
Blamelist: remm

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




-
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

2015-04-17 Thread 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/625

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

Re: TC native proposal

2015-04-17 Thread Mladen Turk 

On 04/07/2015 10:58 AM, Mark Thomas wrote:


Therefore, I'd like to make the following proposal:

1. Update tc-native trunk to use Java sources from tomcat/trunk (9.0.x)
2. Update tc-native 1.1.x to use Java sources from 8.0.x/trunk
3. Ensure 7.0.x/trunk and 6.0.x/trunk have identical Java sources to
8.0.x/trunk (but not adding new classes like SSLExt if not already present).
4. Deprecate the SSLExt and socket.* classes
5. Have tc-native trunk depend on OpenSSL 1.0.2
6. In tc-native trunk add support for ALPN to SSLContext



+1


Regards
--
^TM

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

Françoise Rebel est absente.

2015-04-17 Thread francoise . rebel 




Je serai absent(e) du  17/04/2015 au 27/04/2015.

Je répondrai à votre message dès mon retour.
Je vous souhaite de bonnes fêtes de fin d'année.


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

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

2015-04-17 Thread 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-nio2 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-nio2 :  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-nio2/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-NIO2
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html
Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build)
Work ended in a state of : Failed
Elapsed: 39 mins 12 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-NIO2 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150417-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-20150417.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150417-native-src.tar.gz
 -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true 
-Dexecute.test.nio=false 
-Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150417/bin
 /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false 
-Dtest.excludePerformance=true -Dexecute.test.nio2=true 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar
 -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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

svn commit: r1674408 - in /tomcat/trunk/java/org/apache/catalina: Engine.java Executor.java Group.java

2015-04-17 Thread markt 
Author: markt
Date: Fri Apr 17 21:33:09 2015
New Revision: 1674408

URL: http://svn.apache.org/r1674408
Log:
Javadoc fixes

Modified:
tomcat/trunk/java/org/apache/catalina/Engine.java
tomcat/trunk/java/org/apache/catalina/Executor.java
tomcat/trunk/java/org/apache/catalina/Group.java

Modified: tomcat/trunk/java/org/apache/catalina/Engine.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Engine.java?rev=1674408r1=1674407r2=1674408view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Engine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Engine.java Fri Apr 17 21:33:09 2015
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
 /**
@@ -44,12 +42,8 @@ package org.apache.catalina;
  */
 public interface Engine extends Container {
 
-
-// - Properties
-
-
 /**
- * Return the default hostname for this Engine.
+ * @return the default host name for this Engine.
  */
 public String getDefaultHost();
 
@@ -63,7 +57,7 @@ public interface Engine extends Containe
 
 
 /**
- * Retrieve the JvmRouteId for this engine.
+ * @return the JvmRouteId for this engine.
  */
 public String getJvmRoute();
 
@@ -78,7 +72,7 @@ public interface Engine extends Containe
 
 
 /**
- * Return the codeService/code with which we are associated (if any).
+ * @return the codeService/code with which we are associated (if any).
  */
 public Service getService();
 
@@ -89,6 +83,4 @@ public interface Engine extends Containe
  * @param service The service that owns this Engine
  */
 public void setService(Service service);
-
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/Executor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Executor.java?rev=1674408r1=1674407r2=1674408view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Executor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Executor.java Fri Apr 17 21:33:09 2015
@@ -18,8 +18,8 @@ package org.apache.catalina;
 
 import java.util.concurrent.TimeUnit;
 
-
 public interface Executor extends java.util.concurrent.Executor, Lifecycle {
+
 public String getName();
 
 /**
@@ -31,6 +31,9 @@ public interface Executor extends java.u
  * time until it throws a RejectedExecutionException
  *
  * @param command the runnable task
+ * @param timeout the length of time to wait for the task to complete
+ * @param unitthe units in which timeout is expressed
+ *
  * @throws java.util.concurrent.RejectedExecutionException if this task
  * cannot be accepted for execution - the queue is full
  * @throws NullPointerException if command or unit is null

Modified: tomcat/trunk/java/org/apache/catalina/Group.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Group.java?rev=1674408r1=1674407r2=1674408view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Group.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Group.java Fri Apr 17 21:33:09 2015
@@ -14,15 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
-
 import java.security.Principal;
 import java.util.Iterator;
 
-
 /**
  * pAbstract representation of a group of {@link User}s in a
  * {@link UserDatabase}.  Each user that is a member of this group
@@ -33,12 +29,10 @@ import java.util.Iterator;
  */
 public interface Group extends Principal {
 
-
 // - Properties
 
-
 /**
- * Return the description of this group.
+ * @return the description of this group.
  */
 public String getDescription();
 
@@ -52,7 +46,7 @@ public interface Group extends Principal
 
 
 /**
- * Return the group name of this group, which must be unique
+ * @return the group name of this group, which must be unique
  * within the scope of a {@link UserDatabase}.
  */
 public String getGroupname();
@@ -68,26 +62,25 @@ public interface Group extends Principal
 
 
 /**
- * Return the set of {@link Role}s assigned specifically to this group.
+ * @return the set of {@link Role}s assigned specifically to this group.
  */
 public IteratorRole getRoles();
 
 
 /**
- * Return the {@link UserDatabase} within which this Group is defined.
+ * @return the {@link UserDatabase} within which this Group is defined.
  */
 public UserDatabase getUserDatabase();
 
 
 /**
- * Return the set of {@link User}s that

svn commit: r1674409 - in /tomcat/trunk/java/org/apache/catalina: JmxEnabled.java LifecycleEvent.java LifecycleState.java

2015-04-17 Thread markt 
Author: markt
Date: Fri Apr 17 21:37:59 2015
New Revision: 1674409

URL: http://svn.apache.org/r1674409
Log:
Javadoc fixes

Modified:
tomcat/trunk/java/org/apache/catalina/JmxEnabled.java
tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
tomcat/trunk/java/org/apache/catalina/LifecycleState.java

Modified: tomcat/trunk/java/org/apache/catalina/JmxEnabled.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/JmxEnabled.java?rev=1674409r1=1674408r2=1674409view=diff
==
--- tomcat/trunk/java/org/apache/catalina/JmxEnabled.java (original)
+++ tomcat/trunk/java/org/apache/catalina/JmxEnabled.java Fri Apr 17 21:37:59 
2015
@@ -28,7 +28,7 @@ import javax.management.ObjectName;
 public interface JmxEnabled extends MBeanRegistration {
 
 /**
- * Obtain the domain under which this component will be / has been
+ * @return the domain under which this component will be / has been
  * registered.
  */
 String getDomain();
@@ -38,12 +38,15 @@ public interface JmxEnabled extends MBea
  * Specify the domain under which this component should be registered. Used
  * with components that cannot (easily) navigate the component hierarchy to
  * determine the correct domain to use.
+ *
+ * @param domain The name of the domain under which this component should 
be
+ *   registered
  */
 void setDomain(String domain);
 
 
 /**
- * Obtain the name under which this component has been registered with JMX.
+ * @return the name under which this component has been registered with 
JMX.
  */
 ObjectName getObjectName();
 }

Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1674409r1=1674408r2=1674409view=diff
==
--- tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Fri Apr 17 
21:37:59 2015
@@ -14,19 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina;
 
-
 import java.util.EventObject;
 
-
 /**
  * General event for notifying listeners of significant changes on a component
- * that implements the Lifecycle interface.  In particular, this will be useful
- * on Containers, where these events replace the ContextInterceptor concept in
- * Tomcat 3.x.
+ * that implements the Lifecycle interface.
  *
  * @author Craig R. McClanahan
  */
@@ -35,8 +29,6 @@ public final class LifecycleEvent extend
 private static final long serialVersionUID = 1L;
 
 
-// --- Constructors
-
 /**
  * Construct a new LifecycleEvent with the specified parameters.
  *
@@ -45,16 +37,12 @@ public final class LifecycleEvent extend
  * @param data Event data (if any)
  */
 public LifecycleEvent(Lifecycle lifecycle, String type, Object data) {
-
 super(lifecycle);
 this.type = type;
 this.data = data;
 }
 
 
-// - Instance Variables
-
-
 /**
  * The event data associated with this event.
  */
@@ -67,37 +55,26 @@ public final class LifecycleEvent extend
 private final String type;
 
 
-// - Properties
-
-
 /**
- * Return the event data of this event.
+ * @return the event data of this event.
  */
 public Object getData() {
-
-return (this.data);
-
+return data;
 }
 
 
 /**
- * Return the Lifecycle on which this event occurred.
+ * @return the Lifecycle on which this event occurred.
  */
 public Lifecycle getLifecycle() {
-
 return (Lifecycle) getSource();
-
 }
 
 
 /**
- * Return the event type of this event.
+ * @return the event type of this event.
  */
 public String getType() {
-
-return (this.type);
-
+return this.type;
 }
-
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/LifecycleState.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleState.java?rev=1674409r1=1674408r2=1674409view=diff
==
--- tomcat/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleState.java Fri Apr 17 
21:37:59 2015
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina;
 
 /**
@@ -55,14 +54,14 @@ public enum LifecycleState {
  * li{@link #STOPPING_PREP}/li
  * li{@link

svn commit: r1674410 - /tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

2015-04-17 Thread markt 
Author: markt
Date: Fri Apr 17 21:38:57 2015
New Revision: 1674410

URL: http://svn.apache.org/r1674410
Log:
fix IDE warning

Modified:

tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java

Modified: 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1674410r1=1674409r2=1674410view=diff
==
--- 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 (original)
+++ 
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
 Fri Apr 17 21:38:57 2015
@@ -184,7 +184,7 @@ public class TestUpgradeInternalHandler
 }
 
 
-public static class EchoAsync implements HttpUpgradeHandler, 
InternalHttpUpgradeHandler {
+public static class EchoAsync implements InternalHttpUpgradeHandler {
 private SocketWrapperBase? wrapper;
 @Override
 public void init(WebConnection connection) {



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

buildbot success in ASF Buildbot on tomcat-trunk

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

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

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1674410
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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