Re: Time for a 6.0.x release in January?
On 12/22/2015 10:23 AM, Mark Thomas wrote: > All, > > It has been over 6 months since the last 6.0.x release. The changelog > for 6.0.x is reasonably long so it is looks like time for a release. > > Jean-Frederic or I have done the last few releases. Are there any > volunteers for the release manager role this time around? I should have cycles in January to do it. > > Given the frequency of the 6.0.x releases we should probably take the > time to consider if there are any other fixes that should be back-ported > before the release. Please commit the stuff you want to see fixed ASAP ;-) First week of January is probably the best for my timing. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Change response character encoding
Github user ukari commented on the pull request: https://github.com/apache/tomcat/pull/25#issuecomment-166806452 Thank both of you very much! --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-bio (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test-bio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-bio : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-BIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-BIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-bio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-bio (Type: Build) Work ended in a state of : Failed Elapsed: 32 mins 55 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 -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dtest.temp=output/test-tmp-BIO -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151222.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Dtest.excludePerformance=true -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=false -Dexecute.test.bio=true -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20151222-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151222-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20151222.jar -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomca
[Bug 58758] JDBC Connection Pool exh
https://bz.apache.org/bugzilla/show_bug.cgi?id=58758 Christopher Schultz changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Christopher Schultz --- Bugzilla is not a support forum. Tomcat-pool behaves as expected. If you need help, please post a message to the Tomcat users' mailing list. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58750] Provide way to disable Server header completely
https://bz.apache.org/bugzilla/show_bug.cgi?id=58750 --- Comment #16 from Christopher Schultz --- (In reply to Mark Thomas from comment #9) > I remain unconvinced that there are any real world security benefits to be > gained by removing the security header. Agreed. > The bandwidth argument carries slightly more weight but we are only talking > 27 bytes per response and most responses will dwarf that by at least several > orders of magnitude. Add HTTP/2 to the mix and those 27 bytes will quickly > shrink. While the bytes shrink, the CPU still gets wasted to shrink them. An even better argument *for* a configurable parameter might be HTTP spec. Section 15.1.2 of RFC 2616 pretty much says flat-out that servers SHOULD make the Server header a configurable option. But, RFC 7231 says nothing similar so I'd call it a draw from a spec perspective. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/361 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1721452 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1721454 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/loader/ java/org/ap
Author: violetagg Date: Tue Dec 22 19:43:09 2015 New Revision: 1721454 URL: http://svn.apache.org/viewvc?rev=1721454&view=rev Log: Merged revision 1721447 from tomcat/trunk: Variable cannot be null Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 19:43:09 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,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,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816 -/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,1302
svn commit: r1721452 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/loader/ java/org/ap
Author: violetagg Date: Tue Dec 22 19:29:17 2015 New Revision: 1721452 URL: http://svn.apache.org/viewvc?rev=1721452&view=rev Log: Merged revision 1721447 from tomcat/trunk: Variable cannot be null Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/util/SessionUtils.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Compiler.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 19:29: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,1649973,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,1655351,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,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,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,1 666496,1666552,1666569,1666579,137,149,1666757,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,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550
svn commit: r1721447 - in /tomcat/trunk/java/org/apache: catalina/ant/jmx/ catalina/deploy/ catalina/ha/session/ catalina/loader/ catalina/manager/util/ catalina/valves/rewrite/ jasper/compiler/
Author: violetagg Date: Tue Dec 22 19:16:32 2015 New Revision: 1721447 URL: http://svn.apache.org/viewvc?rev=1721447&view=rev Log: Variable cannot be null Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java tomcat/trunk/java/org/apache/jasper/compiler/Compiler.java Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java?rev=1721447&r1=1721446&r2=1721447&view=diff == --- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java (original) +++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java Tue Dec 22 19:16:32 2015 @@ -190,11 +190,9 @@ public class JMXAccessorSetTask extends String mattrType = null; MBeanInfo minfo = jmxServerConnection.getMBeanInfo(oname); MBeanAttributeInfo attrs[] = minfo.getAttributes(); -if (attrs != null) { -for (int i = 0; mattrType == null && i < attrs.length; i++) { -if (attribute.equals(attrs[i].getName())) -mattrType = attrs[i].getType(); -} +for (int i = 0; mattrType == null && i < attrs.length; i++) { +if (attribute.equals(attrs[i].getName())) +mattrType = attrs[i].getType(); } return mattrType; } Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java?rev=1721447&r1=1721446&r2=1721447&view=diff == --- tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java Tue Dec 22 19:16:32 2015 @@ -1039,18 +1039,16 @@ public class NamingResourcesImpl extends name, container, closeMethod)); return; } -if (m != null) { -try { -m.invoke(resource, (Object[]) null); -} catch (IllegalArgumentException | IllegalAccessException e) { -log.warn(sm.getString("namingResources.cleanupCloseFailed", -closeMethod, name, container), e); -} catch (InvocationTargetException e) { -Throwable t = ExceptionUtils.unwrapInvocationTargetException(e); -ExceptionUtils.handleThrowable(t); -log.warn(sm.getString("namingResources.cleanupCloseFailed", -closeMethod, name, container), t); -} +try { +m.invoke(resource, (Object[]) null); +} catch (IllegalArgumentException | IllegalAccessException e) { +log.warn(sm.getString("namingResources.cleanupCloseFailed", +closeMethod, name, container), e); +} catch (InvocationTargetException e) { +Throwable t = ExceptionUtils.unwrapInvocationTargetException(e); +ExceptionUtils.handleThrowable(t); +log.warn(sm.getString("namingResources.cleanupCloseFailed", +closeMethod, name, container), t); } } Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1721447&r1=1721446&r2=1721447&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Dec 22 19:16:32 2015 @@ -1187,9 +1187,7 @@ public class DeltaManager extends Cluste try { ClassLoader[] loaders = getClassLoaders(); -if ( loaders != null && loaders.length > 0) { -Thread.currentThread().setContextClassLoader(loaders[0]); -} +Thread.currentThread().setContextClassLoader(loaders[0]); if (log.isDebugEnabled()) { log.debug(sm.getString("deltaManager.receiveMessage.eventType", getName(), msg.getEventTypeString(), sender)); Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1721447&r1=1721446&r2=1721447&view=diff ==
buildbot success in ASF Buildbot on tomcat-7-trunk
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/252 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] 1721439 Blamelist: violetagg Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat pull request: Change response character encoding
Github user wenjiezhang2013 commented on the pull request: https://github.com/apache/tomcat/pull/25#issuecomment-166700042 If you read ```The HTTP specification is clear that if no character set is specified for media sub-types of the "text" media type, the ISO-8859-1 character set must be used. However, browsers may attempt to auto-detect the character set. This may be exploited by an attacker to perform an XSS attack. Internet Explorer and other browsers have an option to enable this behavior.``` from http://tomcat.apache.org/tomcat-8.0-doc/config/filter.html#Add_Default_Character_Set_Filter, you will be able to understand the problem --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1721439 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/ java/org/apache/catalina/servlets/ java/org/apache/catalina/startup/ java/org/apache/jasper/compiler/ java/org/apache/
Author: violetagg Date: Tue Dec 22 18:10:26 2015 New Revision: 1721439 URL: http://svn.apache.org/viewvc?rev=1721439&view=rev Log: Merged revisions 1721311, 1721314 from tomcat/trunk: Close streams Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 18:10:26 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,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,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,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702 744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816 -/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,130260
[jira] [Commented] (MTOMCAT-234) Tomcat8 Maven Plugin
[ https://issues.apache.org/jira/browse/MTOMCAT-234?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15068392#comment-15068392 ] Rupert Madden-Abbott commented on MTOMCAT-234: -- So married life is much more busy than I had anticipated but I've found a bit of time to look at this. For starters, I've found another bug that will block this (MTOMCAT-302) and opened a pull request in that ticket to fix it. > Tomcat8 Maven Plugin > > > Key: MTOMCAT-234 > URL: https://issues.apache.org/jira/browse/MTOMCAT-234 > Project: Apache Tomcat Maven Plugin > Issue Type: Dependency upgrade >Affects Versions: 2.0, 2.1, 2.2 > Environment: Maven 3.1, Tomcat8.0RC1, Oracle JDK7u25 >Reporter: Petr Novak >Assignee: Olivier Lamy (*$^¨%`£) >Priority: Blocker > Fix For: 3.0 > > > Please provide initial version of Tomcat8 Maven Plugin. > I tried the recommendations in > http://tomcat.10.x6.nabble.com/Tomcat-8-Tomcat-Maven-Plugin-2-2-Tomcat8-Maven-Plugin-td4995858.html#none > but the guideline > http://tomcat.apache.org/maven-plugin-trunk/tomcat7-maven-plugin/adjust-embedded-tomcat-version.html > does not work for Tomcat8 . > The problem is in changed Tomcat 8 API, the maven throws folloving exception: > at > org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:142) > ... 20 more > by: java.lang.NoSuchMethodError: > org.apache.catalina.startup.Tomcat.setDefaultRealm(Lorg/apache/catalina/Realm;)V > at > org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.startContainer(AbstractRunMojo.java:999) > at > org.apache.tomcat.maven.plugin.tomcat7.run.AbstractRunMojo.execute(AbstractRunMojo.java:514) > at > org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) > ... 20 more > The method setDefaultRealm is deprecated in Tomcat7 and was removed in > Tomcat8 as described in documentation: > http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/startup/Tomcat.html#setDefaultRealm(org.apache.catalina.Realm) -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Issue Comment Deleted] (MTOMCAT-302) Tomcat 8: Invalid resource paths added when scanning for TLDs
[ https://issues.apache.org/jira/browse/MTOMCAT-302?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Rupert Madden-Abbott updated MTOMCAT-302: - Comment: was deleted (was: Here is a (very simple) pull request that fixes this issue.) > Tomcat 8: Invalid resource paths added when scanning for TLDs > - > > Key: MTOMCAT-302 > URL: https://issues.apache.org/jira/browse/MTOMCAT-302 > Project: Apache Tomcat Maven Plugin > Issue Type: Dependency upgrade >Reporter: Rupert Madden-Abbott >Priority: Blocker > Fix For: 3.0 > > > Tomcat 8 now requires that all resource paths begin with "/". > However, in org.apache.tomcat.maven.plugin.tomcat8.run.RunMojo, there is an > anonymous class extending > org.apache.tomcat.maven.plugin.tomcat8.run.AbstractRunMojo.MyDirContext. > This overrides the method listWebAppPaths and the implementation will return > file names, which do not begin with "/". > This will result in an error if you place a tld file in your WEB-INF > directory. Doing this will cause listWebAppPaths to return your tld file, > which then causes an error as the path is not valid. > One solution would be to alter this method so it appended the path relative > to the classpath, to each file. This seems to be how the equivalent method in > org.apache.catalina.webresources.DirResourceSet works. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-302) Tomcat 8: Invalid resource paths added when scanning for TLDs
[ https://issues.apache.org/jira/browse/MTOMCAT-302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15068391#comment-15068391 ] Rupert Madden-Abbott commented on MTOMCAT-302: -- Here is a (very simple) pull request that fixes this issue. > Tomcat 8: Invalid resource paths added when scanning for TLDs > - > > Key: MTOMCAT-302 > URL: https://issues.apache.org/jira/browse/MTOMCAT-302 > Project: Apache Tomcat Maven Plugin > Issue Type: Dependency upgrade >Reporter: Rupert Madden-Abbott >Priority: Blocker > Fix For: 3.0 > > > Tomcat 8 now requires that all resource paths begin with "/". > However, in org.apache.tomcat.maven.plugin.tomcat8.run.RunMojo, there is an > anonymous class extending > org.apache.tomcat.maven.plugin.tomcat8.run.AbstractRunMojo.MyDirContext. > This overrides the method listWebAppPaths and the implementation will return > file names, which do not begin with "/". > This will result in an error if you place a tld file in your WEB-INF > directory. Doing this will cause listWebAppPaths to return your tld file, > which then causes an error as the path is not valid. > One solution would be to alter this method so it appended the path relative > to the classpath, to each file. This seems to be how the equivalent method in > org.apache.catalina.webresources.DirResourceSet works. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Commented] (MTOMCAT-302) Tomcat 8: Invalid resource paths added when scanning for TLDs
[ https://issues.apache.org/jira/browse/MTOMCAT-302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15068390#comment-15068390 ] ASF GitHub Bot commented on MTOMCAT-302: GitHub user rupert654 opened a pull request: https://github.com/apache/tomcat-maven-plugin/pull/21 Ensure that resource paths begin with "/" as required by Tomcat 8. This fixes https://issues.apache.org/jira/browse/MTOMCAT-302 You can merge this pull request into a Git repository by running: $ git pull https://github.com/rupert654/tomcat-maven-plugin MTOMCAT-302 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat-maven-plugin/pull/21.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #21 commit 216c0f0826b6d4d5900fcd7baa62585d36030b8f Author: Rupert Madden-Abbott Date: 2015-12-22T16:47:59Z Ensure that resource paths begin with "/" as required by Tomcat 8. > Tomcat 8: Invalid resource paths added when scanning for TLDs > - > > Key: MTOMCAT-302 > URL: https://issues.apache.org/jira/browse/MTOMCAT-302 > Project: Apache Tomcat Maven Plugin > Issue Type: Dependency upgrade >Reporter: Rupert Madden-Abbott >Priority: Blocker > Fix For: 3.0 > > > Tomcat 8 now requires that all resource paths begin with "/". > However, in org.apache.tomcat.maven.plugin.tomcat8.run.RunMojo, there is an > anonymous class extending > org.apache.tomcat.maven.plugin.tomcat8.run.AbstractRunMojo.MyDirContext. > This overrides the method listWebAppPaths and the implementation will return > file names, which do not begin with "/". > This will result in an error if you place a tld file in your WEB-INF > directory. Doing this will cause listWebAppPaths to return your tld file, > which then causes an error as the path is not valid. > One solution would be to alter this method so it appended the path relative > to the classpath, to each file. This seems to be how the equivalent method in > org.apache.catalina.webresources.DirResourceSet works. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] tomcat-maven-plugin pull request: Ensure that resource paths begin...
GitHub user rupert654 opened a pull request: https://github.com/apache/tomcat-maven-plugin/pull/21 Ensure that resource paths begin with "/" as required by Tomcat 8. This fixes https://issues.apache.org/jira/browse/MTOMCAT-302 You can merge this pull request into a Git repository by running: $ git pull https://github.com/rupert654/tomcat-maven-plugin MTOMCAT-302 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tomcat-maven-plugin/pull/21.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #21 commit 216c0f0826b6d4d5900fcd7baa62585d36030b8f Author: Rupert Madden-Abbott Date: 2015-12-22T16:47:59Z Ensure that resource paths begin with "/" as required by Tomcat 8. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[jira] [Created] (MTOMCAT-302) Tomcat 8: Invalid resource paths added when scanning for TLDs
Rupert Madden-Abbott created MTOMCAT-302: Summary: Tomcat 8: Invalid resource paths added when scanning for TLDs Key: MTOMCAT-302 URL: https://issues.apache.org/jira/browse/MTOMCAT-302 Project: Apache Tomcat Maven Plugin Issue Type: Dependency upgrade Reporter: Rupert Madden-Abbott Priority: Blocker Fix For: 3.0 Tomcat 8 now requires that all resource paths begin with "/". However, in org.apache.tomcat.maven.plugin.tomcat8.run.RunMojo, there is an anonymous class extending org.apache.tomcat.maven.plugin.tomcat8.run.AbstractRunMojo.MyDirContext. This overrides the method listWebAppPaths and the implementation will return file names, which do not begin with "/". This will result in an error if you place a tld file in your WEB-INF directory. Doing this will cause listWebAppPaths to return your tld file, which then causes an error as the path is not valid. One solution would be to alter this method so it appended the path relative to the classpath, to each file. This seems to be how the equivalent method in org.apache.catalina.webresources.DirResourceSet works. -- This message was sent by Atlassian JIRA (v6.3.4#6332) - 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-nio (in module tomcat-8.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.0.x-test-nio has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Timed Out'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 2 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.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151222-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151222.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151222-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO -Dtest.accesslog=true -Dexecute.test.nio=true -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20151222/bin/op enssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-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.
buildbot failure in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a new failure on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/360 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1721346 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1721346 - /tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
Author: markt Date: Tue Dec 22 11:06:59 2015 New Revision: 1721346 URL: http://svn.apache.org/viewvc?rev=1721346&view=rev Log: OpenSSL trunk has removed support for all fixed DH cipher suites Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1721346&r1=1721345&r2=1721346&view=diff == --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java Tue Dec 22 11:06:59 2015 @@ -68,6 +68,12 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA); unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA); unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5); +unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256); if (VERSION < 1) { // These were implemented in 1.0.0 so won't be available in any @@ -153,19 +159,12 @@ public class TesterOpenSSL { } else { // These were removed in 1.0.1 so won't be available from that // version onwards. -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA); +// None at present. } if (VERSION < 10002) { // These were implemented in 1.0.2 so won't be available in any // earlier version -unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256); @@ -177,7 +176,6 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_DH_DSS_WITH_DES_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA); -unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256); @@ -193,8 +191,7 @@ public class TesterOpenSSL { } else { // These were removed in 1.0.2 so won't be available from that // version onwards. -unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); -unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); +// None at present. } if (VERSION < 10100) { @@ -244,12 +241,8 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384); unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384); -unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384); @@ -261,8 +254,6 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384);
svn commit: r1721327 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt Date: Tue Dec 22 10:00:52 2015 New Revision: 1721327 URL: http://svn.apache.org/viewvc?rev=1721327&view=rev Log: OpenSSL trunk has removed support for all fixed DH cipher suites Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1721327&r1=1721326&r2=1721327&view=diff == --- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Tue Dec 22 10:00:52 2015 @@ -70,6 +70,10 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5); unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256); if (VERSION < 1) { // These were implemented in 1.0.0 so won't be available in any @@ -236,12 +240,8 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384); unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384); -unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384); @@ -253,8 +253,6 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384); unimplemented.add(Cipher.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256); -unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256); unimplemented.add(Cipher.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256); @@ -312,6 +310,26 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_RSA_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5); unimplemented.add(Cipher.TLS_RSA_EXPORT_WITH_RC4_40_MD5); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_GCM_SHA256); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_GCM_SHA384); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_GCM_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA256); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_GCM_SHA384); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_WITH_SEED_CBC_SHA); }
svn commit: r1721323 - /tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java
Author: markt Date: Tue Dec 22 09:46:54 2015 New Revision: 1721323 URL: http://svn.apache.org/viewvc?rev=1721323&view=rev Log: Simplify - Ciphers added and removed in same version can be added to unsupported for all list - Ciphers in the unsupported for all list do not need to be added per version Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Modified: tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java?rev=1721323&r1=1721322&r2=1721323&view=diff == --- tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java Tue Dec 22 09:46:54 2015 @@ -68,6 +68,8 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA); unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA); unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5); +unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); +unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); if (VERSION < 1) { // These were implemented in 1.0.0 so won't be available in any @@ -104,7 +106,6 @@ public class TesterOpenSSL { // None at present. } - if (VERSION < 10001) { // These were added in 1.0.1 so won't be available in any earlier // version @@ -153,19 +154,12 @@ public class TesterOpenSSL { } else { // These were removed in 1.0.1 so won't be available from that // version onwards. -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_MD5); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA); -unimplemented.add(Cipher.TLS_RSA_EXPORT1024_WITH_RC4_56_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA); -unimplemented.add(Cipher.TLS_DHE_DSS_WITH_RC4_128_SHA); +// None at present. } if (VERSION < 10002) { // These were implemented in 1.0.2 so won't be available in any // earlier version -unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_256_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_AES_128_CBC_SHA256); @@ -177,7 +171,6 @@ public class TesterOpenSSL { unimplemented.add(Cipher.TLS_DH_DSS_WITH_DES_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA); unimplemented.add(Cipher.TLS_DH_DSS_WITH_SEED_CBC_SHA); -unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_256_CBC_SHA); unimplemented.add(Cipher.TLS_DH_RSA_WITH_AES_128_CBC_SHA256); @@ -193,8 +186,7 @@ public class TesterOpenSSL { } else { // These were removed in 1.0.2 so won't be available from that // version onwards. -unimplemented.add(Cipher.TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA); -unimplemented.add(Cipher.TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA); +// None at present. } if (VERSION < 10100) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Time for a 6.0.x release in January?
All, It has been over 6 months since the last 6.0.x release. The changelog for 6.0.x is reasonably long so it is looks like time for a release. Jean-Frederic or I have done the last few releases. Are there any volunteers for the release manager role this time around? Given the frequency of the 6.0.x releases we should probably take the time to consider if there are any other fixes that should be back-ported before the release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/251 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] 1721310 Blamelist: violetagg BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1721315 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/ant/AbstractCatalinaTask.java java/org/apache/catalina/servlets/DefaultServlet.java
Author: violetagg Date: Tue Dec 22 08:12:57 2015 New Revision: 1721315 URL: http://svn.apache.org/viewvc?rev=1721315&view=rev Log: Merged revision 1721314 from tomcat/trunk: Followup to r1721311 Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 22 08:12:57 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,1649973,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,1655351,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,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,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,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,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,1 666496,1666552,1666569,1666579,137,149,1666757,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,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,168555 6,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,169