Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 15/01/2012 06:06, Konstantin Kolinko wrote: > 2012/1/15 : >> The Buildbot has detected a new failure on builder tomcat-trunk while >> building ASF Buildbot. >> Full details are available at: >> http://ci.apache.org/builders/tomcat-trunk/builds/2653 >> >> Buildbot URL: http://ci.apache.org/ >> >> Buildslave for this Build: bb-vm_ubuntu >> >> Build Reason: scheduler >> Build Source Stamp: [branch tomcat/trunk] 1231625 >> Blamelist: kkolinko >> >> BUILD FAILED: failed compile_1 >> > > It is "org.apache.catalina.mbeans.TestRegistration FAILED" for BIO. > The following mbean was printed to the log before the failure: > [[[ > [junit] Jan 15, 2012 5:27:13 AM > org.apache.catalina.mbeans.TestRegistration testMBeanDeregistration > [junit] INFO: Name: > Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 > [junit] modelerType: org.apache.tomcat.util.modeler.BaseModelMBean > [junit] requestProcessingTime: 1326605233578 > [junit] bytesSent: 0 > [junit] rpName: > Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 > [junit] processingTime: 0 > [junit] errorCount: 0 > [junit] maxTime: 0 > [junit] requestBytesReceived: 0 > [junit] stage: 1 > [junit] lastRequestProcessingTime: 0 > [junit] globalProcessor: org.apache.coyote.RequestGroupInfo@58b51c29 > [junit] serverPort: -1 > [junit] bytesReceived: 0 > [junit] requestCount: 0 > [junit] requestBytesSent: 0 > [junit] contentLength: -1 > [junit] remoteAddr: 127.0.0.1 > ]]] > > So, it has remoteAddr, but it looks like nothing was received. Could this be the call to unlock the acceptor? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn ignore for netbeans
When using netbeans as an ide, it will always create a subdirectory called nbproject inside the project root directory. That means svn status will show this local directory as "?" (not under version control). There are no circumstances where someone should be allowed to commit the nbproject directory or its contents. When I get around to providing sample netbeans project files for tomcat, they should be put in res/netbeans with instructions on how to deploy them (into the nbproject directory) and customise their contents. Would it be possible to add the nbproject directory name to the svn:ignore property of the trunk? I can see you have already done this for the log and work directories. Thanks, Brian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
2012/1/15 Mark Thomas : > On 15/01/2012 06:06, Konstantin Kolinko wrote: >> 2012/1/15 : >>> The Buildbot has detected a new failure on builder tomcat-trunk while >>> building ASF Buildbot. >>> Full details are available at: >>> http://ci.apache.org/builders/tomcat-trunk/builds/2653 >>> >>> Buildbot URL: http://ci.apache.org/ >>> >>> Buildslave for this Build: bb-vm_ubuntu >>> >>> Build Reason: scheduler >>> Build Source Stamp: [branch tomcat/trunk] 1231625 >>> Blamelist: kkolinko >>> >>> BUILD FAILED: failed compile_1 >>> >> >> It is "org.apache.catalina.mbeans.TestRegistration FAILED" for BIO. >> The following mbean was printed to the log before the failure: >> [[[ >> [junit] Jan 15, 2012 5:27:13 AM >> org.apache.catalina.mbeans.TestRegistration testMBeanDeregistration >> [junit] INFO: Name: >> Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 >> [junit] modelerType: org.apache.tomcat.util.modeler.BaseModelMBean >> [junit] requestProcessingTime: 1326605233578 >> [junit] bytesSent: 0 >> [junit] rpName: >> Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 >> [junit] processingTime: 0 >> [junit] errorCount: 0 >> [junit] maxTime: 0 >> [junit] requestBytesReceived: 0 >> [junit] stage: 1 >> [junit] lastRequestProcessingTime: 0 >> [junit] globalProcessor: org.apache.coyote.RequestGroupInfo@58b51c29 >> [junit] serverPort: -1 >> [junit] bytesReceived: 0 >> [junit] requestCount: 0 >> [junit] requestBytesSent: 0 >> [junit] contentLength: -1 >> [junit] remoteAddr: 127.0.0.1 >> ]]] >> >> So, it has remoteAddr, but it looks like nothing was received. > > Could this be the call to unlock the acceptor? > Yes! 1. JIoEndpoint$Acceptor does not check "running" and "paused" flags after accepting the socket and passes it for further processing 2. NioEndpoint$Acceptor checks the flags, but it seems that if "!running" or "paused" flags are set then it does not properly close the accepted socked thus losing it. 3. AprEndpoint$Acceptor seems better, but why it checks the flags only if "deferAccept" is true? Do we really need to start RequestProcessor and consume that OPTIONS request sent by AbstractEndpoint.unlockAccept() ? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: buildbot failure in ASF Buildbot on tomcat-trunk
On 15/01/2012 10:35, Konstantin Kolinko wrote: > 2012/1/15 Mark Thomas : >> On 15/01/2012 06:06, Konstantin Kolinko wrote: >>> 2012/1/15 : The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2653 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1231625 Blamelist: kkolinko BUILD FAILED: failed compile_1 >>> >>> It is "org.apache.catalina.mbeans.TestRegistration FAILED" for BIO. >>> The following mbean was printed to the log before the failure: >>> [[[ >>> [junit] Jan 15, 2012 5:27:13 AM >>> org.apache.catalina.mbeans.TestRegistration testMBeanDeregistration >>> [junit] INFO: Name: >>> Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 >>> [junit] modelerType: org.apache.tomcat.util.modeler.BaseModelMBean >>> [junit] requestProcessingTime: 1326605233578 >>> [junit] bytesSent: 0 >>> [junit] rpName: >>> Tomcat:type=RequestProcessor,worker="http-bio-127.0.0.1-auto-1",name=HttpRequest1 >>> [junit] processingTime: 0 >>> [junit] errorCount: 0 >>> [junit] maxTime: 0 >>> [junit] requestBytesReceived: 0 >>> [junit] stage: 1 >>> [junit] lastRequestProcessingTime: 0 >>> [junit] globalProcessor: org.apache.coyote.RequestGroupInfo@58b51c29 >>> [junit] serverPort: -1 >>> [junit] bytesReceived: 0 >>> [junit] requestCount: 0 >>> [junit] requestBytesSent: 0 >>> [junit] contentLength: -1 >>> [junit] remoteAddr: 127.0.0.1 >>> ]]] >>> >>> So, it has remoteAddr, but it looks like nothing was received. >> >> Could this be the call to unlock the acceptor? >> > > Yes! > > 1. JIoEndpoint$Acceptor does not check "running" and "paused" flags > after accepting the socket and passes it for further processing > > 2. NioEndpoint$Acceptor checks the flags, but it seems that if > "!running" or "paused" flags are set then it does not properly close > the accepted socked thus losing it. > > 3. AprEndpoint$Acceptor seems better, > but why it checks the flags only if "deferAccept" is true? > Do we really need to start RequestProcessor and consume that OPTIONS > request sent by AbstractEndpoint.unlockAccept() ? I don't think so. I think in all cases if the endpoint is paused after the accept, we just close the socket straight away. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52467] "Unable to open the service 'Tomcat7'" when Monitor starts
https://issues.apache.org/bugzilla/show_bug.cgi?id=52467 --- Comment #13 from denixx baykin 2012-01-15 11:38:09 UTC --- Thanks for workaround. It works. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231654 - in /tomcat/trunk: ./ modules/jdbc-pool/
Author: rjung Date: Sun Jan 15 12:03:31 2012 New Revision: 1231654 URL: http://svn.apache.org/viewvc?rev=1231654&view=rev Log: Update svn:ignore: - add Netbeans project folder "nbproject" - sort entries - ignore .* instead of individual files for modules/jdbc-pool like in the main directory Modified: tomcat/trunk/ (props changed) tomcat/trunk/modules/jdbc-pool/ (props changed) Propchange: tomcat/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 15 12:03:31 2012 @@ -1,6 +1,7 @@ .* -output build.properties -work logs +nbproject +output +work *.iml Propchange: tomcat/trunk/modules/jdbc-pool/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 15 12:03:31 2012 @@ -1,6 +1,4 @@ -.classpath -.project -.settings +.* bin build.properties includes - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231655 - /tomcat/trunk/.gitignore
Author: rjung Date: Sun Jan 15 12:09:30 2012 New Revision: 1231655 URL: http://svn.apache.org/viewvc?rev=1231655&view=rev Log: Add Netbeans project folder nbproject to .gitignore. Modified: tomcat/trunk/.gitignore Modified: tomcat/trunk/.gitignore URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1231655&r1=1231654&r2=1231655&view=diff == --- tomcat/trunk/.gitignore (original) +++ tomcat/trunk/.gitignore Sun Jan 15 12:09:30 2012 @@ -16,6 +16,7 @@ # - output logs +nbproject work build.properties mvn.properties @@ -34,4 +35,4 @@ bin/setenv.* java/org/apache/catalina/startup/catalina.properties modules/jdbc-pool/bin modules/jdbc-pool/includes -webapps/docs/jdbc-pool.xml \ No newline at end of file +webapps/docs/jdbc-pool.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231657 - in /tomcat/tc7.0.x/trunk: ./ .gitignore webapps/docs/changelog.xml
Author: rjung Date: Sun Jan 15 12:26:12 2012 New Revision: 1231657 URL: http://svn.apache.org/viewvc?rev=1231657&view=rev Log: Update svn:ignore: - add Netbeans project folder "nbproject" - sort entries - ignore .* instead of individual files for modules/jdbc-pool like in the main directory Add Netbeans project folder nbproject to .gitignore. Sync .gitignore from trunk. Backports of r1231654, r1231655. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/.gitignore tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jan 15 12:26:12 2012 @@ -1,6 +1,7 @@ .* -output build.properties -work logs +nbproject +output +work *.iml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 12:26:12 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,12313
svn commit: r1231660 - /tomcat/tc7.0.x/trunk/modules/
Author: rjung Date: Sun Jan 15 12:37:57 2012 New Revision: 1231660 URL: http://svn.apache.org/viewvc?rev=1231660&view=rev Log: Updatesvn:externals for modules/jdbc-pool to pick up svn:ignore changes. Modified: tomcat/tc7.0.x/trunk/modules/ (props changed) Propchange: tomcat/tc7.0.x/trunk/modules/ -- --- svn:externals (original) +++ svn:externals Sun Jan 15 12:37:57 2012 @@ -1 +1 @@ -^/tomcat/trunk/modules/jdbc-pool@1231341 jdbc-pool +^/tomcat/trunk/modules/jdbc-pool@1231654 jdbc-pool - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn ignore for netbeans
On 15.01.2012 10:44, Brian Burch wrote: When using netbeans as an ide, it will always create a subdirectory called nbproject inside the project root directory. That means svn status will show this local directory as "?" (not under version control). There are no circumstances where someone should be allowed to commit the nbproject directory or its contents. When I get around to providing sample netbeans project files for tomcat, they should be put in res/netbeans with instructions on how to deploy them (into the nbproject directory) and customise their contents. Would it be possible to add the nbproject directory name to the svn:ignore property of the trunk? I can see you have already done this for the log and work directories. I added nbproject to svn:ignore and .gitignore for trunk and TC 7. Regards, Rainer - 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-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2657 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1231655 Blamelist: rjung BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) 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-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-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-trunk-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-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 19 mins Command Line: /usr/lib/jvm/java-6-openjdk/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/dist/junit-15012012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15012012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15012012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-15012012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-15012012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/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-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.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/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/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.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-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-15012012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-15012012.jar:/srv/gump/public/workspace/junit/dist/junit-15012012.jar -
svn commit: r1231703 - /tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
Author: rjung Date: Sun Jan 15 16:24:34 2012 New Revision: 1231703 URL: http://svn.apache.org/viewvc?rev=1231703&view=rev Log: Fix wrong TC deps version in eclipse path. Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1231703&r1=1231702&r2=1231703&view=diff == --- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original) +++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Sun Jan 15 16:24:34 2012 @@ -22,7 +22,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2658 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1231703 Blamelist: rjung Build succeeded! sincerely, -The Buildbot
svn commit: r1231738 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Author: markt
Date: Sun Jan 15 20:03:19 2012
New Revision: 1231738
URL: http://svn.apache.org/viewvc?rev=1231738&view=rev
Log:
Log full stack trace when there is an error - may provide more clues as
to what is going on.
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java?rev=1231738&r1=1231737&r2=1231738&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Sun Jan 15
20:03:19 2012
@@ -81,7 +81,7 @@ public class MBeanDumper {
value=mbeanServer.getAttribute(oname, attName);
} catch (Throwable t) {
log.error("Error getting attribute " + oname +
-" " + attName + " " + t.toString());
+" " + attName, t);
continue;
}
if (value==null) continue;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231740 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java JIoEndpoint.java NioEndpoint.java
Author: markt
Date: Sun Jan 15 20:04:05 2012
New Revision: 1231740
URL: http://svn.apache.org/viewvc?rev=1231740&view=rev
Log:
Ensure that connections from unlockAccept() do not get passed to a
processor.
Reduce differences between BIO, NIO and APR acceptor code.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1231740&r1=1231739&r2=1231740&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Jan 15
20:04:05 2012
@@ -941,21 +941,16 @@ public class AprEndpoint extends Abstrac
return log;
}
-// --- Acceptor Inner Class
-
+// --- Acceptor Inner Class
/**
- * Server socket acceptor thread.
+ * The background thread that listens for incoming TCP/IP connections and
+ * hands them off to an appropriate processor.
*/
protected class Acceptor extends AbstractEndpoint.Acceptor {
private final Log log = LogFactory.getLog(AprEndpoint.Acceptor.class);
-
-/**
- * The background thread that listens for incoming TCP/IP connections
and
- * hands them off to an appropriate processor.
- */
@Override
public void run() {
@@ -997,17 +992,13 @@ public class AprEndpoint extends Abstrac
// Successful accept, reset the error delay
errorDelay = 0;
-/*
- * In the case of a deferred accept unlockAccept needs to
- * send data. This data will be rubbish, so destroy the
- * socket and don't process it.
- */
-if (deferAccept && (paused || !running)) {
-destroySocket(socket);
-continue;
-}
-// Hand this socket off to an appropriate processor
-if (!processSocketWithOptions(socket)) {
+if (running && !paused) {
+// Hand this socket off to an appropriate processor
+if (!processSocketWithOptions(socket)) {
+// Close socket and pool right away
+destroySocket(socket);
+}
+} else {
// Close socket and pool right away
destroySocket(socket);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=1231740&r1=1231739&r2=1231740&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Jan 15
20:04:05 2012
@@ -177,14 +177,11 @@ public class JIoEndpoint extends Abstrac
// --- Acceptor Inner Class
/**
- * Server socket acceptor thread.
+ * The background thread that listens for incoming TCP/IP connections and
+ * hands them off to an appropriate processor.
*/
protected class Acceptor extends AbstractEndpoint.Acceptor {
-/**
- * The background thread that listens for incoming TCP/IP connections
and
- * hands them off to an appropriate processor.
- */
@Override
public void run() {
@@ -227,23 +224,15 @@ public class JIoEndpoint extends Abstrac
errorDelay = 0;
// Configure the socket
-if (setSocketOptions(socket)) {
+if (running && !paused && setSocketOptions(socket)) {
// Hand this socket off to an appropriate processor
if (!processSocket(socket)) {
// Close socket right away
-try {
-socket.close();
-} catch (IOException e) {
-// Ignore
-}
+closeSocket(socket);
}
} else {
// Close socket right away
-try {
-socket.close();
-} catc
svn commit: r1231741 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/mbeans/MBeanDumper.java
Author: markt Date: Sun Jan 15 20:06:45 2012 New Revision: 1231741 URL: http://svn.apache.org/viewvc?rev=1231741&view=rev Log: Log full stack trace when there is an error - may provide more clues as to what is going on. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanDumper.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 20:06:45 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231654-1231655 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1
svn commit: r1231743 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java java/org/apache/tomcat/util/net/JIoEndpoint.java java/org/apache/tomcat/util/net/NioEndpoint.java w
Author: markt Date: Sun Jan 15 20:08:09 2012 New Revision: 1231743 URL: http://svn.apache.org/viewvc?rev=1231743&view=rev Log: Ensure that connections from unlockAccept() do not get passed to a processor. Reduce differences between BIO, NIO and APR acceptor code. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 20:08:09 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231654-1231655,1231738 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,11578
DO NOT REPLY [Bug 10021] Include upgrade option in installer
https://issues.apache.org/bugzilla/show_bug.cgi?id=10021 --- Comment #8 from Mark Thomas 2012-01-15 20:59:40 UTC --- There are complications with the "just over-write the binaries and JARs" and include: - required changes to config files - changes in JAR names (e.g. JDT updates) I am leaning more towards WONTFIX as further complications are identified. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1230765 - in /tomcat/trunk/java/org/apache/catalina/core: ContainerBase.java StandardContext.java
2012/1/13 :
> Author: markt
> Date: Thu Jan 12 20:34:24 2012
> New Revision: 1230765
>
> URL: http://svn.apache.org/viewvc?rev=1230765&view=rev
> Log:
> Move destruction of ContainerBase objects to ContainerBase to ensure
> that they are destroyed.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
> tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1230765&r1=1230764&r2=1230765&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Jan 12
> 20:34:24 2012
> @@ -1195,6 +1195,20 @@ public abstract class ContainerBase exte
> @Override
> protected void destroyInternal() throws LifecycleException {
>
> + if ((manager != null) && (manager instanceof Lifecycle)) {
> + ((Lifecycle) manager).destroy();
> + }
> + Realm realm = getRealmInternal();
> + if ((realm != null) && (realm instanceof Lifecycle)) {
> + ((Lifecycle) realm).destroy();
> + }
> + if ((cluster != null) && (cluster instanceof Lifecycle)) {
> + ((Lifecycle) cluster).destroy();
> + }
> + if ((loader != null) && (loader instanceof Lifecycle)) {
> + ((Lifecycle) loader).destroy();
> + }
> +
> // Stop the Valves in our pipeline (including the basic), if any
> if (pipeline instanceof Lifecycle) {
> ((Lifecycle) pipeline).destroy();
I think valves should be destroyed first and those helper objects
second, like the order in stopInternal(). Though I understand that the
current order better matches to what happened with destroy code in
StandardContext.
>
> Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1230765&r1=1230764&r2=1230765&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Jan
> 12 20:34:24 2012
> @@ -5450,20 +5450,6 @@ public class StandardContext extends Con
> @Override
> protected void destroyInternal() throws LifecycleException {
>
> - if ((manager != null) && (manager instanceof Lifecycle)) {
> - ((Lifecycle) manager).destroy();
> - }
> - Realm realm = getRealmInternal();
> - if ((realm != null) && (realm instanceof Lifecycle)) {
> - ((Lifecycle) realm).destroy();
> - }
> - if ((cluster != null) && (cluster instanceof Lifecycle)) {
> - ((Lifecycle) cluster).destroy();
> - }
> - if ((loader != null) && (loader instanceof Lifecycle)) {
> - ((Lifecycle) loader).destroy();
> - }
> -
> // If in state NEW when destroy is called, the object name will never
> // have been set so the notification can't be created
> if (getObjectName() != null) {
>
>
>
> -
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231762 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
Author: markt
Date: Sun Jan 15 21:37:18 2012
New Revision: 1231762
URL: http://svn.apache.org/viewvc?rev=1231762&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38216
Add the ability to invoke MBean operations through the JMXProxy
Based on a patch by Christopher Hlubek
Also improved error reporting to help debugging.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
tomcat/trunk/webapps/docs/manager-howto.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1231762&r1=1231761&r2=1231762&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Sun Jan
15 21:37:18 2012
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.manager;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Set;
import javax.management.Attribute;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.servlet.ServletException;
@@ -101,6 +100,19 @@ public class JMXProxyServlet extends Htt
getAttribute( writer, qry, name );
return;
}
+qry = request.getParameter("invoke");
+if(qry != null) {
+String opName=request.getParameter("op");
+String ps = request.getParameter("ps");
+String[] valuesStr;
+if (ps == null) {
+valuesStr = new String[0];
+} else {
+valuesStr = request.getParameter("ps").split(",");
+}
+invokeOperation( writer, qry, opName,valuesStr );
+return;
+}
qry=request.getParameter("qry");
if( qry == null ) {
qry = "*:*";
@@ -117,7 +129,8 @@ public class JMXProxyServlet extends Htt
writer.println("OK - Attribute get '" + onameStr + "' - " + att
+ "= " + MBeanDumper.escape(value.toString()));
} catch (Exception ex) {
-writer.println("Error - " + ex.toString());
+writer.println("Error");
+ex.printStackTrace(writer);
}
}
@@ -131,7 +144,8 @@ public class JMXProxyServlet extends Htt
mBeanServer.setAttribute( oname, new Attribute(att, valueObj));
writer.println("OK - Attribute set");
} catch( Exception ex ) {
-writer.println("Error - " + ex.toString());
+writer.println("Error");
+ex.printStackTrace(writer);
}
}
@@ -143,8 +157,9 @@ public class JMXProxyServlet extends Htt
names=mBeanServer.queryNames(new ObjectName(qry), null);
writer.println("OK - Number of results: " + names.size());
writer.println();
-} catch (Exception e) {
-writer.println("Error - " + e.toString());
+} catch (Exception ex) {
+writer.println("Error");
+ex.printStackTrace(writer);
return;
}
@@ -161,4 +176,38 @@ public class JMXProxyServlet extends Htt
public boolean isSupported(String type) {
return true;
}
+
+
+private void invokeOperation(PrintWriter writer, String onameStr, String
op,
+String[] valuesStr) {
+try {
+ObjectName oname=new ObjectName( onameStr );
+MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,op);
+MBeanParameterInfo[] signature = methodInfo.getSignature();
+String[] signatureTypes = new String[signature.length];
+Object[] values = new Object[signature.length];
+for (int i = 0; i < signature.length; i++) {
+ MBeanParameterInfo pi = signature[i];
+ signatureTypes[i] = pi.getType();
+ values[i] = registry.convertValue(pi.getType(), valuesStr[i] );
+ }
+
+Object retVal = mBeanServer.invoke(oname,op,values,signatureTypes);
+writer.println("OK - Operation " + op + " returned:");
+output("", writer, retVal);
+} catch( Exception ex ) {
+writer.println("Error");
+ex.printStackTrace(writer);
+}
+}
+
+private void output(String indent, PrintWriter writer, Object result) {
+if (result instanceof Object[]) {
+for (Object obj : (Object[]) result) {
+output(" " + indent, writer, obj);
+}
+} else {
+writer.println(indent + result.toString());
+}
+}
}
Modified: tomcat/trunk/webapps/do
svn commit: r1231763 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: markt Date: Sun Jan 15 21:39:28 2012 New Revision: 1231763 URL: http://svn.apache.org/viewvc?rev=1231763&view=rev Log: Fix typo Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1231763&r1=1231762&r2=1231763&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Sun Jan 15 21:39:28 2012 @@ -1307,7 +1307,7 @@ Error: java.lang.NumberFormatException: http://webserver/manager/jmxproxy/?invoke=BEANNAME&op=METHODNAME&ps=COMMASEPARATEDPARAMETERS -For exmaple, to call the findConnectors() method of the +For example, to call the findConnectors() method of the Service use: http://localhost:8080/manager/jmxproxy/?invoke=Catalina%3Atype%3DService&op=findConnectors&ps= - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231764 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/changelog.xml webapps/docs/manager-howto.xml
Author: markt Date: Sun Jan 15 21:41:34 2012 New Revision: 1231764 URL: http://svn.apache.org/viewvc?rev=1231764&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38216 Add the ability to invoke MBean operations through the JMXProxy Based on a patch by Christopher Hlubek Also improved error reporting to help debugging. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 15 21:41:34 2012 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187 381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1 201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853,1214855,1214864,1215115,1215118-1215119,1215121,1220293,1220295,1221038,1221842,1222189,101,176,1222300,1222690,1222850,1222852,1222855,1224607,1224617,1224648-1224652,1224657,1224662-1224663,1224682,1224801,1224910,1225000,1225219,1225343,1225465,1225627,1225629,1225634,1226069,1226158-1226159,1226177,1226196,1226214-1226215,1226385,1226394,1226500,1226537-1226538,1226546,1226551,1226975,1228196,1228360,1228376,1228724,1228908,1228918,1228920,1228922,1228929,1228969,1229307,1229536,1229549,1229724,1229726-1229731,1229997,1230539,1230711,1230729,1230762-1230763,1230765,1230955,1230957,1231285,123129 0,1231308,1231310,1231337,1231460-1231461,1231542-1231543,1231546-1231547,1231620-1231621,1231654-1231655,1231738,1231740 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,
DO NOT REPLY [Bug 38216] Extend Jmxproxy to allow call of MBean Operations
https://issues.apache.org/bugzilla/show_bug.cgi?id=38216 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #5 from Mark Thomas 2012-01-15 21:42:53 UTC --- After rather too long a variation of this patch has been applied to trunk and 7.0.x and will be included in 7.0.24 onwards. The main changes I made to the proposed patch were: - fixing a potential NPE when a method required zero parameters - improving the output when an array was returned (as is often the case with Tomcat MBeans) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 40728] Catalina MBeans use non-serializable classes
https://issues.apache.org/bugzilla/show_bug.cgi?id=40728 Mark Thomas changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #13 from Mark Thomas 2012-01-15 21:47:58 UTC --- Them current scope of this issue is too broad for there to be meaningful progress. What would help enormously is a prioritised list (as long or as short as you like) of attributes that you would like to see accessible that aren't currently. I'd be happy to see lists from multiple folks. Without some form of priority there are so many attributes that aren't accessible, I don't see anyone just starting to work through them all. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 44904] Provide warning message when DataSource's maxActive="0"
https://issues.apache.org/bugzilla/show_bug.cgi?id=44904 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #2 from Mark Thomas 2012-01-15 21:54:20 UTC --- There are far too many configuration settings that can me set in ways likely to break things to add warnings for every one. It does make sense to do this for frequent mistakes. I don't see this happening often enough to justify adding the warning. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48358] JSP-unloading reloaded
https://issues.apache.org/bugzilla/show_bug.cgi?id=48358 Mark Thomas changed: What|Removed |Added Component|Jasper |Jasper Version|trunk |unspecified Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #21 from Mark Thomas 2012-01-15 21:56:52 UTC --- Moving to 6.0.x as this feature has been present in 7.0.x for some time. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48892] Use URIEncoding from server.xml for decoding post data sent with application/x-www-form-urlencoded mime type
https://issues.apache.org/bugzilla/show_bug.cgi?id=48892 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #3 from Mark Thomas 2012-01-15 21:59:32 UTC --- Resolving as WONTFIX. A filter is the best way to handle this until such time that browsers send the necessary encoding info. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231773 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko
Date: Sun Jan 15 22:14:02 2012
New Revision: 1231773
URL: http://svn.apache.org/viewvc?rev=1231773&view=rev
Log:
Replace description with a formal patch, including the fix from Rainer's review.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1231773&r1=1231772&r2=1231773&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Jan 15 22:14:02 2012
@@ -91,16 +91,12 @@ PATCHES PROPOSED TO BACKPORT:
-1:
* Reduce log level for the message about hitting maxParameterCount limit
- from WARN to INFO.
- in java/org/apache/tomcat/util/http/Parameters.java line 242:
- - log.warn(sm.getString("parameters.maxCountFail",
- + log.info(sm.getString("parameters.maxCountFail",
+ from WARN to INFO and fix comparison of parameterCount vs limit that
+ triggers this message.
+
http://people.apache.org/~kkolinko/patches/2012-01-16_tc6_Parameters_maxCountFail.patch
(backport of http://svn.apache.org/viewvc?rev=1224665&view=rev)
+1: kkolinko, rjung
-1:
- rjung: Why do we compare "parameterCount >= limit" in line 240?
- Shouldn't it be ">"?
- kkolinko: I agree, it must be changed to "> limit".
* Update to Apache Commons Pool 1.5.7
In build.properties.default line 138:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51334] Web SSO support based on WS-Federation Passive Requestor Profile
https://issues.apache.org/bugzilla/show_bug.cgi?id=51334 --- Comment #3 from Mark Thomas 2012-01-15 22:14:15 UTC --- This is a relatively large amount of code and I do not recall any demand for this from the Tomcat user community. On that basis, I do not believe that this belongs in the Core Tomcat distribution. It might make sense as a module and distributed as another extra (i.e. built as part of the release but provided as a separate download). Even then, I'm not convinced there is sufficient demand for this feature to make the effort required to add it and maintain it going forward worth while. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231776 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_24: ./ build.properties.default
Author: markt Date: Sun Jan 15 22:21:41 2012 New Revision: 1231776 URL: http://svn.apache.org/viewvc?rev=1231776&view=rev Log: Tag 7.0.24 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ (props changed) - copied from r1231773, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- --- bugtraq:message (added) +++ bugtraq:message Sun Jan 15 22:21:41 2012 @@ -0,0 +1 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- bugtraq:number = true Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- bugtraq:warnifnoissue = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- --- subclipse:tags (added) +++ subclipse:tags Sun Jan 15 22:21:41 2012 @@ -0,0 +1,27 @@ +933020,TOMCAT_7_0_0_RC1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC1,tag +945257,TOMCAT_7_0_0_RC2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC2,tag +947494,TOMCAT_7_0_0_RC3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC3,tag +952212,TOMCAT_7_0_0_RC4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0_RC4,tag +954232,TOMCAT_7_0_0,/tomcat/tc7.0.x/tags/TOMCAT_7_0_0,tag +981255,TOMCAT_7_0_1,/tomcat/tc7.0.x/tags/TOMCAT_7_0_1,tag +982035,TOMCAT_7_0_2,/tomcat/tc7.0.x/tags/TOMCAT_7_0_2,tag +1003912,TOMCAT_7_0_3,/tomcat/tc7.0.x/tags/TOMCAT_7_0_3,tag +1022637,TOMCAT_7_0_4,/tomcat/tc7.0.x/tags/TOMCAT_7_0_4,tag +1038717,TOMCAT_7_0_5,/tomcat/tc7.0.x/tags/TOMCAT_7_0_5,tag +1057288,TOMCAT_7_0_6,/tomcat/tc7.0.x/tags/TOMCAT_7_0_6,tag +1066773,TOMCAT_7_0_7,/tomcat/tc7.0.x/tags/TOMCAT_7_0_7,tag +1067169,TOMCAT_7_0_8,/tomcat/tc7.0.x/tags/TOMCAT_7_0_8,tag +1075337,TOMCAT_7_0_9,/tomcat/tc7.0.x/tags/TOMCAT_7_0_9,tag +1078282,TOMCAT_7_0_10,/tomcat/tc7.0.x/tags/TOMCAT_7_0_10,tag +1080182,TOMCAT_7_0_11,/tomcat/tc7.0.x/tags/TOMCAT_7_0_11,tag +1087797,TOMCAT_7_0_12,/tomcat/tc7.0.x/tags/TOMCAT_7_0_12,tag +1101230,TOMCAT_7_0_14,/tomcat/tc7.0.x/tags/TOMCAT_7_0_14,tag +1101232,TOMCAT_7_0_13,/tomcat/tc7.0.x/tags/TOMCAT_7_0_13,tag +1131469,TOMCAT_7_0_15,/tomcat/tc7.0.x/tags/TOMCAT_7_0_15,tag +1134562,TOMCAT_7_0_16,/tomcat/tc7.0.x/tags/TOMCAT_7_0_16,tag +1142314,TOMCAT_7_0_17,/tomcat/tc7.0.x/tags/TOMCAT_7_0_17,tag +1143610,TOMCAT_7_0_18,/tomcat/tc7.0.x/tags/TOMCAT_7_0_18,tag +1146504,TOMCAT_7_0_19,/tomcat/tc7.0.x/tags/TOMCAT_7_0_19,tag +1155255,TOMCAT_7_0_20,/tomcat/tc7.0.x/tags/TOMCAT_7_0_20,tag +1162976,TOMCAT_7_0_21,/tomcat/tc7.0.x/tags/TOMCAT_7_0_21,tag +1176597,TOMCAT_7_0_22,/tomcat/tc7.0.x/tags/TOMCAT_7_0_22,tag Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- --- svn:ignore (added) +++ svn:ignore Sun Jan 15 22:21:41 2012 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 15 22:21:41 2012 @@ -0,0 +1 @@ +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,11
svn commit: r1231779 - in /tomcat/tc7.0.x/trunk: ./ build.xml res/License.rtf res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko
Date: Sun Jan 15 22:33:12 2012
New Revision: 1231779
URL: http://svn.apache.org/viewvc?rev=1231779&view=rev
Log:
Merged revisions r1231624 r1231625 r1231630 from tomcat/trunk:
1. When building a Windows installer do not copy whole "res" folder to
output/dist, but only the files that we need. Apply fixcrlf only after all
files has been copied.
The difference is what line ends the INSTALLLICENSE and tomcat.nsi files will
have.
Some NSIS docs [1] mention that license file must have CRLF line ends.
[1] "4.8.1.26 LicenseData" in Scripting Reference,
http://nsis.sourceforge.net/Docs/Chapter4.html#4.8.1.26
2. Remove res/License.rtf
The file that is actually shown by the Windows installer in res/INSTALLLICENSE.
We do not need two license files here.
The MUI_PAGE_LICENSE macro in tomcat.nsi file actually creates its own
LicenseData statement, though not a global one but scoped to PageEx directive.
The global LicenseData statement is not needed, because we have no other
license pages besides the one created by this macro.
For reference - see:
1) ${base.path}/nsis-2.46/Contrib/Modern UI 2/Pages/License.nsh
-> MUI_PAGE_LICENSE macro source code (line 50)
2) LicenseData + PageEx example in NSIS documentation,
"4.5.2 Page Options" http://nsis.sourceforge.net/Docs/Chapter4.html#4.5.2
"4.5.6 PageEx" http://nsis.sourceforge.net/Docs/Chapter4.html#4.5.6
Removed:
tomcat/tc7.0.x/trunk/res/License.rtf
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/tomcat.nsi
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 15 22:33:12 2012
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096
,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174975,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187
381,1187753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1
201931,1202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,120
[VOTE] Release Apache Tomcat 7.0.24
The proposed Apache Tomcat 7.0.24 release is now available for voting. It can be obtained from: http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ The proposed 7.0.24 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.24 Stable I dropped both alpha and beta as if it is not stable, I'll re-roll the release. Cheers, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.24
2012/1/16 Mark Thomas : > The proposed Apache Tomcat 7.0.24 release is now available for voting. > > It can be obtained from: > http://people.apache.org/~markt/dev/tomcat-7/v7.0.24/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_24/ > > The proposed 7.0.24 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.24 Stable > > I dropped both alpha and beta as if it is not stable, I'll re-roll the > release. > Thus far (quick testing) everything is OK. Mark, can you upload files to Nexus? It should be easier to prepare everything while vote goes. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231815 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Jan 16 03:25:00 2012 New Revision: 1231815 URL: http://svn.apache.org/viewvc?rev=1231815&view=rev Log: Add missing changelog entry for r1207799 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1231815&r1=1231814&r2=1231815&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jan 16 03:25:00 2012 @@ -287,6 +287,9 @@ +Update Apache Commons Daemon to 1.0.8. (mturk) + + Update Apache Commons Pool to 1.5.7. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1231817 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.properties.default webapps/docs/changelog.xml
Author: kkolinko
Date: Mon Jan 16 03:26:54 2012
New Revision: 1231817
URL: http://svn.apache.org/viewvc?rev=1231817&view=rev
Log:
Update to Apache Commons Pool 1.5.7
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1231817&r1=1231816&r2=1231817&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 16 03:26:54 2012
@@ -98,18 +98,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, rjung
-1:
-* Update to Apache Commons Pool 1.5.7
- In build.properties.default line 138:
- - commons-pool.version=1.5.6
- + commons-pool.version=1.5.7
- Changelog: http://commons.apache.org/pool/changes-report.html
- Reminder: One has to explicitly select "download" target in build.xml to
- pick up the changes, as in the usual "deploy" target there is no check
- that tomcat-dbcp.jar that has been built earlier used the specified
- versions of pool and dbcp.
- +1: kkolinko, rjung, markt
- -1:
-
PATCHES/ISSUES THAT ARE STALLED
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1231817&r1=1231816&r2=1231817&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Mon Jan 16 03:26:54 2012
@@ -135,7 +135,7 @@ commons-dbcp-src.loc.1=${base-commons.lo
commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
# - Commons Pool, version 1.1 or later -
-commons-pool.version=1.5.6
+commons-pool.version=1.5.7
commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1231817&r1=1231816&r2=1231817&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 16 03:26:54 2012
@@ -49,6 +49,9 @@
Update Apache Commons Daemon to 1.0.8. (mturk)
+
+Update Apache Commons Pool to 1.5.7. (kkolinko)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1231762 - in /tomcat/trunk: java/org/apache/catalina/manager/JMXProxyServlet.java webapps/docs/manager-howto.xml
2012/1/16 :
> Author: markt
> Date: Sun Jan 15 21:37:18 2012
> New Revision: 1231762
>
> URL: http://svn.apache.org/viewvc?rev=1231762&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38216
> Add the ability to invoke MBean operations through the JMXProxy
> Based on a patch by Christopher Hlubek
> Also improved error reporting to help debugging.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
> tomcat/trunk/webapps/docs/manager-howto.xml
>
> Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1231762&r1=1231761&r2=1231762&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Sun
> Jan 15 21:37:18 2012
> @@ -14,16 +14,15 @@
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> -
> -
> package org.apache.catalina.manager;
>
> -
> import java.io.IOException;
> import java.io.PrintWriter;
> import java.util.Set;
>
> import javax.management.Attribute;
> +import javax.management.MBeanOperationInfo;
> +import javax.management.MBeanParameterInfo;
> import javax.management.MBeanServer;
> import javax.management.ObjectName;
> import javax.servlet.ServletException;
> @@ -101,6 +100,19 @@ public class JMXProxyServlet extends Htt
> getAttribute( writer, qry, name );
> return;
> }
> + qry = request.getParameter("invoke");
> + if(qry != null) {
> + String opName=request.getParameter("op");
> + String ps = request.getParameter("ps");
> + String[] valuesStr;
> + if (ps == null) {
> + valuesStr = new String[0];
> + } else {
> + valuesStr = request.getParameter("ps").split(",");
getParameter() has been called already, thus just
ps.split(",")
> + }
> + invokeOperation( writer, qry, opName,valuesStr );
> + return;
> + }
> qry=request.getParameter("qry");
> if( qry == null ) {
> qry = "*:*";
> @@ -117,7 +129,8 @@ public class JMXProxyServlet extends Htt
> writer.println("OK - Attribute get '" + onameStr + "' - " + att
> + "= " + MBeanDumper.escape(value.toString()));
> } catch (Exception ex) {
> - writer.println("Error - " + ex.toString());
> + writer.println("Error");
> + ex.printStackTrace(writer);
I think it would be better to keep "Error - " + message on the first line.
Some scripts might be looking for "Error -".
> }
> }
>
> @@ -131,7 +144,8 @@ public class JMXProxyServlet extends Htt
> mBeanServer.setAttribute( oname, new Attribute(att, valueObj));
> writer.println("OK - Attribute set");
> } catch( Exception ex ) {
> - writer.println("Error - " + ex.toString());
> + writer.println("Error");
> + ex.printStackTrace(writer);
> }
> }
>
> @@ -143,8 +157,9 @@ public class JMXProxyServlet extends Htt
> names=mBeanServer.queryNames(new ObjectName(qry), null);
> writer.println("OK - Number of results: " + names.size());
> writer.println();
> - } catch (Exception e) {
> - writer.println("Error - " + e.toString());
> + } catch (Exception ex) {
> + writer.println("Error");
> + ex.printStackTrace(writer);
> return;
> }
>
> @@ -161,4 +176,38 @@ public class JMXProxyServlet extends Htt
> public boolean isSupported(String type) {
> return true;
> }
> +
> +
> + private void invokeOperation(PrintWriter writer, String onameStr, String
> op,
> + String[] valuesStr) {
> + try {
> + ObjectName oname=new ObjectName( onameStr );
> + MBeanOperationInfo methodInfo = registry.getMethodInfo(oname,op);
> + MBeanParameterInfo[] signature = methodInfo.getSignature();
> + String[] signatureTypes = new String[signature.length];
> + Object[] values = new Object[signature.length];
> + for (int i = 0; i < signature.length; i++) {
> + MBeanParameterInfo pi = signature[i];
> + signatureTypes[i] = pi.getType();
> + values[i] = registry.convertValue(pi.getType(), valuesStr[i]
> );
> + }
> +
> + Object retVal =
> mBeanServer.invoke(oname,op,values,signatureTypes);
> + writer.println("OK - Operation " + op + " returned:");
> + output("", writer, retVal);
> + } catch( Exception ex ) {
> + writer.println("Error");
> + ex.printSt
