[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: 31 mins 18 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-20160111.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-20160111-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-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-20160111.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
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test-apr : 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-apr/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-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 6 mins 36 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-APR -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-20160111.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=true -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/wo rkspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160111/lib -Dexecute.test.nio=false -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160111.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
svn commit: r1723995 - in /tomcat/site/trunk: docs/presentations.html xdocs/presentations.xml
Author: markt Date: Mon Jan 11 09:46:59 2016 New Revision: 1723995 URL: http://svn.apache.org/viewvc?rev=1723995&view=rev Log: Update presentation page Modified: tomcat/site/trunk/docs/presentations.html tomcat/site/trunk/xdocs/presentations.xml Modified: tomcat/site/trunk/docs/presentations.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1723995&r1=1723994&r2=1723995&view=diff == --- tomcat/site/trunk/docs/presentations.html (original) +++ tomcat/site/trunk/docs/presentations.html Mon Jan 11 09:46:59 2016 @@ -218,27 +218,13 @@ presentations then please do let us know Scheduled presentations -TLS Virtual Hosting (markt) - - - -Webinar: http://markmail.org/message/4bby2xijssm54aip";>Tuesday - 8 December 2015 10.00 UTC - - -Webinar: http://markmail.org/message/hjkdx5hptbqq3b6d";>Tuesday - 8 December 2015 21.00 UTC - - - - TLS key/certificate generation (markt) -Webinar: Tuesday 5 January 2016 10.00 UTC +Webinar: Tuesday 19 January 2016 10.00 UTC -Webinar: Tuesday 5 January 2016 20.00 UTC +Webinar: Tuesday 19 January 2016 20.00 UTC @@ -290,6 +276,9 @@ mailing list. Tomcat 9: HTTP/2 Quick Start (markt) https://www.youtube.com/watch?v=oCFwgMvouis";>video +TLS Virtual Hosting (markt) https://www.youtube.com/watch?v=UnEcYYutbRg";>video + + Modified: tomcat/site/trunk/xdocs/presentations.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1723995&r1=1723994&r2=1723995&view=diff == --- tomcat/site/trunk/xdocs/presentations.xml (original) +++ tomcat/site/trunk/xdocs/presentations.xml Mon Jan 11 09:46:59 2016 @@ -16,17 +16,10 @@ presentations then please do let us know Tomcat Users mailing list. -TLS Virtual Hosting (markt) - - Webinar: http://markmail.org/message/4bby2xijssm54aip";>Tuesday - 8 December 2015 10.00 UTC - Webinar: http://markmail.org/message/hjkdx5hptbqq3b6d";>Tuesday - 8 December 2015 21.00 UTC - TLS key/certificate generation (markt) - Webinar: Tuesday 5 January 2016 10.00 UTC - Webinar: Tuesday 5 January 2016 20.00 UTC + Webinar: Tuesday 19 January 2016 10.00 UTC + Webinar: Tuesday 19 January 2016 20.00 UTC @@ -51,6 +44,7 @@ mailing list. Tomcat 9: HTTP/2 Quick Start (markt) https://www.youtube.com/watch?v=oCFwgMvouis";>video +TLS Virtual Hosting (markt) https://www.youtube.com/watch?v=UnEcYYutbRg";>video - 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-nio (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-nio has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. 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-nio : 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-nio/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-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-NIO/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-nio/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 31 mins 40 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-NIO -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-20160111.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=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/w orkspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Dtest.reports=output/logs-NIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dexecute.test.nio=true -Dtest.accesslog=true -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20160111.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.
[Bug 58831] Fix release script - missing files in Windows binaries (from VOTE thread of 1.2.4)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58831 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED OS||All Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Script updated. The updated script will be used for 1.2.5 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58831] Fix release script - missing files in Windows binaries (from VOTE thread of 1.2.4)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58831 Konstantin Kolinko changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOPENED --- Comment #2 from Konstantin Kolinko --- How about pdb files? The following commands: [[[ copy WINXP_X86_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-win32-bin\bin copy WINXP_X86_OCSP_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-ocsp-win32-bin\bin copy WINXP_X86_DLL_RELEASE\tcnative-1-src.pdb tomcat-native-%VER%-win32-bin\bin copy WINXP_X86_OCSP_DLL_RELEASE\tcnative-1-src.pdb tomcat-native-%VER%-ocsp-win32-bin\bin copy WINXP_X64_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-win32-bin\bin\x64 copy WINXP_X64_OCSP_DLL_RELEASE\tcnative-1.dll tomcat-native-%VER%-ocsp-win32-bin\bin\x64 ]]] The X64 part misses the 2 commands to copy pdb files. -- 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 58831] Fix release script - missing files in Windows binaries (from VOTE thread of 1.2.4)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58831 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED --- Comment #3 from Mark Thomas --- Look again. -- 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
[VOTE-RESTARTED][RESULT] Release Apache Tomcat Native 1.2.4
The following votes were cast: +1 (binding): remm, kkolinko, jfclere, markt As per the discussion on the release thread, I will update the 1.2.4 binaries to include the openssl.exe binary from 1.2.3 before release. Thanks to everyone who tested this and apologies for having to restart the vote. The updates to the scripts/instructions should mean that won't happen again. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58831] Fix release script - missing files in Windows binaries (from VOTE thread of 1.2.4)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58831 --- Comment #4 from Konstantin Kolinko --- Ack. Looks good. -- 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: r11867 - /dev/tomcat/tomcat-connectors/native/1.2.4/binaries/
Author: markt Date: Mon Jan 11 10:58:43 2016 New Revision: 11867 Log: Update binaries to add openssl.exe (built using 1.0.2e) from 1.2.3 binary distribution Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1 dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.asc dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.md5 dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.sha1 Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip == Binary files - no diff available. Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc (original) +++ dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.asc Mon Jan 11 10:58:43 2016 @@ -1,17 +1,17 @@ -BEGIN PGP SIGNATURE- Version: GnuPG v2 -iQIcBAABCAAGBQJWjQ35AAoJEBDAHFovYFnnD0IQANqxWb89wXWqitDO3mdnCOi5 -SJoYekgTWYB9jPCcSncN6kJEzq6mVVKu/Kj8Y8SGgJBQ9Asi/zdAeCNPniukTjvW -n1G15CUOa8vtzrbL3FQJyPjOa4ZZqN8ICbJ7Fw5nO+wLgVnhf3wMVNDXW1+trguO -VPRPvwnuDRUEh5RKiCx1VCilqh8Otm2gTD9c01DSei0dR3I9KKQpIt+BkfITUY5p -uA5aaAEek64pQeFQkVs2N+l2SKL+A1VJjue8WnJjlsIeKMLlhVMArFdUVnXTP6XS -NFUbv0hcmdOJgVCTRJa5G4OcoeMmqQWj8yk+IJqN/UvOcAD7oVf9Pdl5wabiV7EK -/opt8E1pCuMIOdgeYyIOzlWR7V/dvbS72fe1s6geCxSrAcQF6iPwiSI+D+gkXsmb -FsLf+moT3+rA5av5YoWEvK04KERJoDs/jfqpM2Qq2q59JDBpA9af6Ktiw8mC+5RB -bxeRpPKr/QG00m/mv/ueDsFPKDaCSeSikk/wrWSpaDQOLtOZv2eqJPKN4BfsPGLD -Bc4oBbVSxurfphCka891M47qV9p58JLG4y77o2AMSQJMsRMDhpkjfVGEjyDNRUnJ -LMyvECO8WcbJoNII9yMqLDc9cBD944HGx1FAO08ECDrFL5IqDhqd4dBp2mCC91l0 -zhQlKH+goqaypkQsU3OL -=VE2o +iQIcBAABCAAGBQJWk4pfAAoJEBDAHFovYFnn/KUP/iPXO0txl3JwU68adXn3S04X +9vN9BQU1ea3xu1OlIhkVUzH0VgVfGg+gaIfZSPctNaW5krhmKGgH+zbcOXKQVeTR +HoiWZby4gswuPVsUrk108mwMHiv1pmLfEeNNP0SolZs4rTON2N9AKBqeQSG3ZIIR +EVRTt0lKK1mt8OlUAmNms467tUOnqkxLlgNoAiWEAc1AfAynrhle13DsG3PCiHe/ +Nu9vnbRDMjwGecgEs1z0be3JMiJpGwaB5TEvsvEW+sagVZfILUujOLtSwK2GiA50 +YLbejPaxJdhSoheLAWXIl7K8zlmB5kj+MfqTX0Hp/t/oQE3umQ5LXa6qgxaYRpks +D6YPLxwst/UV0v2ITZ0mE0Rpp3HlQuNDUtyBPKBwwS2aaZGCy21q/UML7GRJ7nMD +28vFUvTGDk5CqYFMReHcfceYqlK0HoFLWHA33LGo+PDHkuMOqI2hSvSJqBIYjb1E +l4hCMjy7kA3dVJ+5smkeBmYx6j44x8C79EwPPLPoQ162xIlkDkPiMYcCwcthIELc +7VG1oS8i9NAoomA+2izMbos1am8n9VddELpkqAR58rLosd1o/zW8MWk+JubZNJb/ +sYc3w02rIUU53JmU6p/ZX6Tb2hvI3C/O0VdjRylgj2+0dCLKkmkXEAGwf6nM9BhO +DDmnaUbW2AktmO2WKYDf +=vGcY -END PGP SIGNATURE- Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5 == --- dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5 (original) +++ dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.md5 Mon Jan 11 10:58:43 2016 @@ -1 +1 @@ -b70e6525eb83c31e8befe48daebe18f2 *tomcat-native-1.2.4-ocsp-win32-bin.zip \ No newline at end of file +14fe2ade8a29d3eaf58e41e0f16e3c18 *tomcat-native-1.2.4-ocsp-win32-bin.zip \ No newline at end of file Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1 == --- dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1 (original) +++ dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-ocsp-win32-bin.zip.sha1 Mon Jan 11 10:58:43 2016 @@ -1 +1 @@ -eb585afdb3e239cd57f88aaecf8f58b727111c14 *tomcat-native-1.2.4-ocsp-win32-bin.zip \ No newline at end of file +98d34c5f77cb06890b89d1bb7c2c4cd6e696adf1 *tomcat-native-1.2.4-ocsp-win32-bin.zip \ No newline at end of file Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip == Binary files - no diff available. Modified: dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.asc == --- dev/tomcat/tomcat-connectors/native/1.2.4/binaries/tomcat-native-1.2.4-win32-bin.zip.asc (original) +++ dev/tomcat/tomcat-conn
svn commit: r11868 - /dev/tomcat/tomcat-connectors/native/1.2.4/ /release/tomcat/tomcat-connectors/native/1.2.4/
Author: markt Date: Mon Jan 11 11:01:28 2016 New Revision: 11868 Log: Release Tomcat Native 1.2.4 Added: release/tomcat/tomcat-connectors/native/1.2.4/ - copied from r11867, dev/tomcat/tomcat-connectors/native/1.2.4/ Removed: dev/tomcat/tomcat-connectors/native/1.2.4/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat CWiki commit notifications missing
Hi! Does Confluence wiki at [1] generate commit notification e-mails? None of those are received by dev@tomcat list. [1] https://cwiki.apache.org/confluence/display/TOMCAT/ 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: r1724007 - in /tomcat/site/trunk: docs/download-60.html xdocs/download-60.xml
Author: kkolinko Date: Mon Jan 11 11:21:52 2016 New Revision: 1724007 URL: http://svn.apache.org/viewvc?rev=1724007&view=rev Log: Add links to "Full Ducumentation" and "Extras". Modified: tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/xdocs/download-60.xml Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=1724007&r1=1724006&r2=1724007&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Mon Jan 11 11:21:52 2016 @@ -333,6 +333,21 @@ +Full documentation: + + + + +tar.gz +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha1";>sha1) + + + + + + Deployer: @@ -351,6 +366,45 @@ + + + +Extras: + + + + +JMX Remote jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.sha1";>sha1) + + + + +Web services jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.sha1";>sha1) + + + + +JULI adapters jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.sha1";>sha1) + + + + +JULI log4j jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli.jar.sha1";>sha1) + + + Modified: tomcat/site/trunk/xdocs/download-60.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-60.xml?rev=1724007&r1=1724006&r2=1724007&view=diff == --- tomcat/site/trunk/xdocs/download-60.xml (original) +++ tomcat/site/trunk/xdocs/download-60.xml Mon Jan 11 11:21:52 2016 @@ -110,6 +110,16 @@ +Full documentation: + + +tar.gz +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/apache-tomcat-[v]-fulldocs.tar.gz.sha1";>sha1) + + + Deployer: @@ -124,6 +134,34 @@ +Extras: + + +JMX Remote jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-jmx-remote.jar.sha1";>sha1) + + +Web services jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/catalina-ws.jar.sha1";>sha1) + + +JULI adapters jar +(https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.asc";>pgp, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.md5";>md5, +https://www.apache.org/dist/tomcat/tomcat-6/v[v]/bin/extras/tomcat-juli-adapters.jar.sha1";>sha1) + + +JULI log4j jar +(
Re: Tomcat CWiki commit notifications missing
On 11/01/2016 11:04, Konstantin Kolinko wrote: > Hi! > > Does Confluence wiki at [1] generate commit notification e-mails? I think we'll need to create an account for the dev list and then set up a watch on the space. I'll get that set up and post the password in the usual place. Mark > > None of those are received by dev@tomcat list. > > > [1] https://cwiki.apache.org/confluence/display/TOMCAT/ > > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat CWiki commit notifications missing
On 11/01/2016 11:38, Mark Thomas wrote: > On 11/01/2016 11:04, Konstantin Kolinko wrote: >> Hi! >> >> Does Confluence wiki at [1] generate commit notification e-mails? > > I think we'll need to create an account for the dev list and then set up > a watch on the space. > > I'll get that set up and post the password in the usual place. Hmm. That might not be such a good idea. The notification e-mail contains links for managing watches that might work without authentication. I'm currently watching the entire Tomcat space. Could you make a small edit and I'll see what the notification e-mail I get looks like. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724012 - in /tomcat/trunk: build.properties.default webapps/docs/changelog.xml
Author: markt
Date: Mon Jan 11 11:57:06 2016
New Revision: 1724012
URL: http://svn.apache.org/viewvc?rev=1724012&view=rev
Log:
Bump Tomcat-native to 1.2.4
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1724012&r1=1724011&r2=1724012&view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Jan 11 11:57:06 2016
@@ -156,7 +156,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.3
+tomcat-native.version=1.2.4
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1724012&r1=1724011&r2=1724012&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 11 11:57:06 2016
@@ -347,7 +347,7 @@
Update optional Checkstyle library to 6.14.1. (kkolinko)
-Update the packaged version of the Tomcat Native Library to 1.2.3 to
+Update the packaged version of the Tomcat Native Library to 1.2.4 to
pick up the Windows binaries that are based on OpenSSL 1.0.2e and APR
1.5.1. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724015 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Author: markt
Date: Mon Jan 11 12:15:49 2016
New Revision: 1724015
URL: http://svn.apache.org/viewvc?rev=1724015&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1724015&r1=1724014&r2=1724015&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Jan 11 12:15:49 2016
@@ -86,8 +86,6 @@ public class OpenSSLContext implements o
private final long aprPool;
protected final long ctx;
-@SuppressWarnings("unused")
-private volatile int aprPoolDestroyed;
private static final AtomicIntegerFieldUpdater
DESTROY_UPDATER
= AtomicIntegerFieldUpdater.newUpdater(OpenSSLContext.class,
"aprPoolDestroyed");
static final CertificateFactory X509_CERT_FACTORY;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724024 - in /tomcat/trunk/java/org/apache/tomcat/util/net: LocalStrings.properties SSLImplementation.java
Author: markt
Date: Mon Jan 11 13:48:24 2016
New Revision: 1724024
URL: http://svn.apache.org/viewvc?rev=1724024&view=rev
Log:
Factory method for default instance is overly flexible. Simplify.
Add some Javadoc.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1724024&r1=1724023&r2=1724024&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Jan 11 13:48:24 2016
@@ -121,3 +121,5 @@ sslHostConfig.certificateVerificationInv
sslHostConfig.certificate.notype=Multiple certificates were specified and at
least one is missing the required attribute type
sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used
with a connector of type [{3}]
sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
+
+sslImplementation.cnfe= Unable to create SSLImplementation for class [{0}]
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1724024&r1=1724023&r2=1724024&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Mon Jan
11 13:48:24 2016
@@ -21,37 +21,42 @@ import javax.net.ssl.SSLSession;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.net.jsse.JSSEImplementation;
+import org.apache.tomcat.util.res.StringManager;
-/* SSLImplementation:
-
- Abstract factory and base class for all SSL implementations.
-
- @author EKR
+/**
+ * Provides a factory and base implementation for the Tomcat specific mechanism
+ * that allows alternative SSL/TLS implementations to be used without requiring
+ * the implementation of a full JSSE provider.
*/
public abstract class SSLImplementation {
-private static final Log logger =
LogFactory.getLog(SSLImplementation.class);
-// The default implementations in our search path
-private static final String JSSEImplementationClass =
-"org.apache.tomcat.util.net.jsse.JSSEImplementation";
-
-private static final String[] implementations = { JSSEImplementationClass
};
-
-public static SSLImplementation getInstance() throws
ClassNotFoundException {
-for (int i = 0; i < implementations.length; i++) {
-try {
-SSLImplementation impl = getInstance(implementations[i]);
-return impl;
-} catch (Exception e) {
-if (logger.isTraceEnabled())
-logger.trace("Error creating " + implementations[i], e);
-}
-}
+private static final Log logger =
LogFactory.getLog(SSLImplementation.class);
+private static final StringManager sm =
StringManager.getManager(SSLImplementation.class);
-// If we can't instantiate any of these
-throw new ClassNotFoundException("Can't find any SSL implementation");
+/**
+ * Obtain an instance (not a singleton) of the default implementation.
+ * Currently, this is the standard JSSE implementation that ships as part
of
+ * the JRE. Tomcat also provides an OpenSSL based implementation.
+ *
+ * @return The default implementation
+ */
+public static SSLImplementation getInstance() {
+return new JSSEImplementation();
}
+
+/**
+ * Obtain an instance (not a singleton) of the implementation with the
given
+ * class name.
+ *
+ * @param className The class name of the required implementation
+ *
+ * @return An instance of the required implementation
+ *
+ * @throws ClassNotFoundException If an instance of the requested class
+ * cannot be created
+ */
public static SSLImplementation getInstance(String className)
throws ClassNotFoundException {
if (className == null)
@@ -61,12 +66,15 @@ public abstract class SSLImplementation
Class clazz = Class.forName(className);
return (SSLImplementation) clazz.newInstance();
} catch (Exception e) {
-if (logger.isDebugEnabled())
-logger.debug("Error loading SSL Implementation " + className,
e);
-throw new ClassNotFoundExceptio
svn commit: r1724028 - in /tomcat/trunk/java/org/apache: catalina/connector/ tomcat/util/net/ tomcat/util/net/jsse/ tomcat/util/net/openssl/
Author: markt
Date: Mon Jan 11 13:58:22 2016
New Revision: 1724028
URL: http://svn.apache.org/viewvc?rev=1724028&view=rev
Log:
SSLImplementation.getName() is not used so remove it.
Further simplify the factory part of SSLImplementation
Remove OpenSSLImplementation.IMPLEMENTATION_NAME. Since it is the class name,
use the class name.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Jan 11
13:58:22 2016
@@ -1008,7 +1008,7 @@ public class Connector extends Lifecycle
AbstractHttp11JsseProtocol jsseProtocolHandler =
(AbstractHttp11JsseProtocol) protocolHandler;
if (jsseProtocolHandler.getSslImplementationName() == null) {
// OpenSSL is compatible with the JSSE configuration, so use
it if APR is available
-
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.IMPLEMENTATION_NAME);
+
jsseProtocolHandler.setSslImplementationName(OpenSSLImplementation.class.getName());
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Jan 11 13:58:22 2016
@@ -64,7 +64,7 @@ public abstract class AbstractJsseEndpoi
@Override
protected Type getSslConfigType() {
-if
(OpenSSLImplementation.IMPLEMENTATION_NAME.equals(sslImplementationName)) {
+if
(OpenSSLImplementation.class.getName().equals(sslImplementationName)) {
return SSLHostConfig.Type.EITHER;
} else {
return SSLHostConfig.Type.JSSE;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1724028&r1=1724027&r2=1724028&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Mon Jan
11 13:58:22 2016
@@ -35,22 +35,11 @@ public abstract class SSLImplementation
private static final StringManager sm =
StringManager.getManager(SSLImplementation.class);
/**
- * Obtain an instance (not a singleton) of the default implementation.
- * Currently, this is the standard JSSE implementation that ships as part
of
- * the JRE. Tomcat also provides an OpenSSL based implementation.
- *
- * @return The default implementation
- */
-public static SSLImplementation getInstance() {
-return new JSSEImplementation();
-}
-
-
-/**
* Obtain an instance (not a singleton) of the implementation with the
given
* class name.
*
- * @param className The class name of the required implementation
+ * @param className The class name of the required implementation or null
to
+ * use the default (currently {@link JSSEImplementation}.
*
* @return An instance of the required implementation
*
@@ -60,7 +49,7 @@ public abstract class SSLImplementation
public static SSLImplementation getInstance(String className)
throws ClassNotFoundException {
if (className == null)
-return getInstance();
+return new JSSEImplementation();
try {
Class clazz = Class.forName(className);
@@ -75,8 +64,6 @@ public abstract class SSLImplementation
}
-public abstract String getImplementationName();
-
public abstract SSLSupport getSSLSupport(SSLSession session);
public abstract SSLUtil getSSLUtil(SSLHostConfig sslHostConfig,
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1724028&r1=1724027&r2=172402
Re: [VOTE-RESTARTED] Release Apache Tomcat Native 1.2.4
Jean, trying to move to CMake for making portable? 2016-01-08 10:13 GMT+01:00 jean-frederic clere : > On 01/06/2016 08:45 PM, Mark Thomas wrote: > > On 06/01/2016 19:34, Rainer Jung wrote: > >> Hi Mark, > >> > >> there's no file bin/openssl.exe in the Windows binariy zip files. > >> > >> It existed in 1.2.3 but was also missing for 1.2.2. It also exists in > >> 1.2.0 and 1.2.1 as well as 1.1.33 and 1.1.34. So I guess it should be > >> included for 1.2.4 as well? > > > > I think that is an artefact of how I built the release. I should update > > the scripts to take a copy of the openssl.exe. > > > > I'm not particularly concerned. I could copy it across from 1.2.3 if > > people think it is essential. > > It is probably better to have it as building on windows is a challenge > for a lot of people. > > Cheers > > Jean-Frederic > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Quiero ser el rayo de sol que cada día te despierta para hacerte respirar y vivir en me. "Favola -Moda".
svn commit: r1724041 - /tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
Author: markt
Date: Mon Jan 11 14:35:54 2016
New Revision: 1724041
URL: http://svn.apache.org/viewvc?rev=1724041&view=rev
Log:
Improve Javadoc
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java?rev=1724041&r1=1724040&r2=1724041&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtil.java Mon Jan 11
14:35:54 2016
@@ -22,6 +22,11 @@ import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.TrustManager;
+/**
+ * Provides a common interface for {@link SSLImplementation}s to create the
+ * necessary JSSE implementation objects for TLS connections created via the
+ * JSSE API.
+ */
public interface SSLUtil {
public SSLContext createSSLContext(List negotiableProtocols)
throws Exception;
@@ -60,6 +65,11 @@ public interface SSLUtil {
*/
public String[] getEnableableProtocols(SSLContext context);
+/**
+ * Optional interface that can be implemented by
+ * {@link javax.net.ssl.SSLEngine}s to indicate that they support ALPN and
+ * can provided the protocol agreed with the client.
+ */
public interface ProtocolInfo {
/**
* ALPN information.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724042 - in /tomcat/trunk/java/org/apache/tomcat/util/net: jsse/JSSEImplementation.java jsse/JSSESocketFactory.java jsse/JSSEUtil.java openssl/OpenSSLUtil.java
Author: markt
Date: Mon Jan 11 14:41:07 2016
New Revision: 1724042
URL: http://svn.apache.org/viewvc?rev=1724042&view=rev
Log:
JSSESocketFactory is not a socket factory. Time for a rename.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
- copied, changed from r1724040,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Removed:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?rev=1724042&r1=1724041&r2=1724042&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Mon Jan 11 14:41:07 2016
@@ -47,6 +47,6 @@ public class JSSEImplementation extends
@Override
public SSLUtil getSSLUtil(SSLHostConfig sslHostConfig,
SSLHostConfigCertificate certificate) {
-return new JSSESocketFactory(sslHostConfig, certificate);
+return new JSSEUtil(sslHostConfig, certificate);
}
}
Copied: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (from
r1724040,
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?p2=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java&p1=tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java&r1=1724040&r2=1724042&rev=1724042&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Mon Jan 11
14:41:07 2016
@@ -61,21 +61,18 @@ import org.apache.tomcat.util.net.SSLUti
import org.apache.tomcat.util.res.StringManager;
/**
- * SSL server socket factory. It requires a valid RSA key and
- * JSSE.
- * keytool -genkey -alias tomcat -keyalg RSA
- * Use "changeit" as password (this is the default we use).
+ * SSLUtil implementation for JSSE.
*
* @author Harish Prabandham
* @author Costin Manolache
* @author Stefan Freyr Stefansson
- * @author EKR -- renamed to JSSESocketFactory
+ * @author EKR
* @author Jan Luehe
*/
-public class JSSESocketFactory implements SSLUtil {
+public class JSSEUtil implements SSLUtil {
-private static final Log log = LogFactory.getLog(JSSESocketFactory.class);
-private static final StringManager sm =
StringManager.getManager(JSSESocketFactory.class);
+private static final Log log = LogFactory.getLog(JSSEUtil.class);
+private static final StringManager sm =
StringManager.getManager(JSSEUtil.class);
private final SSLHostConfig sslHostConfig;
private final SSLHostConfigCertificate certificate;
@@ -83,7 +80,7 @@ public class JSSESocketFactory implement
private final String[] defaultServerProtocols;
-public JSSESocketFactory (SSLHostConfig sslHostConfig,
SSLHostConfigCertificate certificate) {
+public JSSEUtil (SSLHostConfig sslHostConfig, SSLHostConfigCertificate
certificate) {
this.sslHostConfig = sslHostConfig;
this.certificate = certificate;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java?rev=1724042&r1=1724041&r2=1724042&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java Mon
Jan 11 14:41:07 2016
@@ -26,13 +26,13 @@ import org.apache.tomcat.util.net.SSLCon
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.SSLUtil;
-import org.apache.tomcat.util.net.jsse.JSSESocketFactory;
+import org.apache.tomcat.util.net.jsse.JSSEUtil;
public class OpenSSLUtil implements SSLUtil {
private final SSLHostConfig sslHostConfig;
private final SSLHostConfigCertificate certificate;
-private final JSSESocketFactory jsseUtil;
+private final JSSEUtil jsseUtil;
private String[] enabledProtocols = null;
private String[] enabledCiphers = null;
@@ -42,7 +42,7 @@ public class OpenSSLUtil implements SSLU
this.certificate = certificate;
if (certificate.getCertificateFile() == null) {
// Using JSSE configuration for keystore and tru
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/896 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1724042 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: r1724066 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/jsse/ java/org/apache/tomcat/util/net/openssl/ test/org/apache/tomcat/util/net/jsse/
Author: markt
Date: Mon Jan 11 15:40:04 2016
New Revision: 1724066
URL: http://svn.apache.org/viewvc?rev=1724066&view=rev
Log:
Refactoring
- Add a base class for SSLUtil. Not used much at the moment but I have plans...
- Only need to pass SSLHostCondigCertificate when creating SSLUtil since it has
a reference to the SSLHostConfig already
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLUtil.java
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/TesterBug50640SslImpl.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1724066&r1=1724065&r2=1724066&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Jan 11 15:40:04 2016
@@ -78,7 +78,7 @@ public abstract class AbstractJsseEndpoi
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
for (SSLHostConfigCertificate certificate :
sslHostConfig.getCertificates(true)) {
-SSLUtil sslUtil =
sslImplementation.getSSLUtil(sslHostConfig, certificate);
+SSLUtil sslUtil =
sslImplementation.getSSLUtil(certificate);
SSLContext sslContext =
sslUtil.createSSLContext(negotiableProtocols);
sslContext.init(sslUtil.getKeyManagers(),
sslUtil.getTrustManagers(), null);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java?rev=1724066&r1=1724065&r2=1724066&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
Mon Jan 11 15:40:04 2016
@@ -78,6 +78,11 @@ public class SSLHostConfigCertificate {
// Common
+public SSLHostConfig getSSLHostConfig() {
+return sslHostConfig;
+}
+
+
public Type getType() {
return type;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1724066&r1=1724065&r2=1724066&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Mon Jan
11 15:40:04 2016
@@ -66,6 +66,5 @@ public abstract class SSLImplementation
public abstract SSLSupport getSSLSupport(SSLSession session);
-public abstract SSLUtil getSSLUtil(SSLHostConfig sslHostConfig,
-SSLHostConfigCertificate certificate);
+public abstract SSLUtil getSSLUtil(SSLHostConfigCertificate certificate);
}
Added: tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java?rev=1724066&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLUtilBase.java Mon Jan 11
15:40:04 2016
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the sp
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/897 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1724066 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE-RESTARTED] Release Apache Tomcat Native 1.2.4
On 01/11/2016 03:10 PM, Giorgio Zoppi wrote: > Jean, > trying to move to CMake for making portable? That might be something to look at my previous tries with CMake weren't successful but feel free to contribute. Cheers Jean-Frederic - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724094 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Author: markt
Date: Mon Jan 11 17:35:29 2016
New Revision: 1724094
URL: http://svn.apache.org/viewvc?rev=1724094&view=rev
Log:
Whoops. Fix regression in r1724015.
Code was used although I can't see why a simple AtomicInteger wasn't sufficient.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1724094&r1=1724093&r2=1724094&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Jan 11 17:35:29 2016
@@ -25,7 +25,7 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLEngine;
@@ -84,10 +84,10 @@ public class OpenSSLContext implements o
}
private final long aprPool;
+private final AtomicInteger aprPoolDestroyed = new AtomicInteger(0);
+
protected final long ctx;
-private static final AtomicIntegerFieldUpdater
DESTROY_UPDATER
-= AtomicIntegerFieldUpdater.newUpdater(OpenSSLContext.class,
"aprPoolDestroyed");
static final CertificateFactory X509_CERT_FACTORY;
private static final String BEGIN_KEY = "-BEGIN RSA PRIVATE
KEY-\n";
@@ -171,7 +171,7 @@ public class OpenSSLContext implements o
@Override
public synchronized void destroy() {
// Guard against multiple destroyPools() calls triggered by
construction exception and finalize() later
-if (DESTROY_UPDATER.compareAndSet(this, 0, 1)) {
+if (aprPoolDestroyed.compareAndSet(0, 1)) {
if (ctx != 0) {
SSLContext.free(ctx);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1724094 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
2016-01-11 18:35 GMT+01:00 : > Author: markt > Date: Mon Jan 11 17:35:29 2016 > New Revision: 1724094 > > URL: http://svn.apache.org/viewvc?rev=1724094&view=rev > Log: > Whoops. Fix regression in r1724015. > Code was used although I can't see why a simple AtomicInteger wasn't > sufficient. > > The Netty code used this. I'm not convinced either, but of course if there's any problem it will crash. Rémy
Re: svn commit: r1724094 - /tomcat/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
On 11/01/2016 17:50, Rémy Maucherat wrote: > 2016-01-11 18:35 GMT+01:00 : > >> Author: markt >> Date: Mon Jan 11 17:35:29 2016 >> New Revision: 1724094 >> >> URL: http://svn.apache.org/viewvc?rev=1724094&view=rev >> Log: >> Whoops. Fix regression in r1724015. >> Code was used although I can't see why a simple AtomicInteger wasn't >> sufficient. > > The Netty code used this. I'm not convinced either, but of course if > there's any problem it will crash. I guess we'll find out if there is an issue. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio (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-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-trunk-test-nio : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-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-trunk/output/logs-NIO -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 3 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-20160111-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160111.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-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-ma ster/dest-20160111/bin/openssl -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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/buil
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (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-nio2 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-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build timed out -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 1 hour 4 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-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160111.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl -master/dest-20160111/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -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-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-tr
[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: 47 mins 44 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-20160111.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-20160111-native-src.tar.gz -Dtest.reports=output/logs-BIO -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160111-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-20160111.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
svn commit: r1724144 - in /tomcat/trunk/java/org/apache: catalina/loader/ catalina/manager/ catalina/manager/host/ catalina/manager/util/ tomcat/util/modeler/
Author: remm
Date: Mon Jan 11 23:29:45 2016
New Revision: 1724144
URL: http://svn.apache.org/viewvc?rev=1724144&view=rev
Log:
Javadoc fixes.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/util/SessionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1724144&r1=1724143&r2=1724144&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Mon
Jan 11 23:29:45 2016
@@ -445,7 +445,7 @@ public abstract class WebappClassLoaderB
// - Properties
/**
- * Get associated resources.
+ * @return associated resources.
*/
public WebResourceRoot getResources() {
return this.resources;
@@ -454,6 +454,8 @@ public abstract class WebappClassLoaderB
/**
* Set associated resources.
+ * @param resources the resources from which the classloader will
+ * load the classes
*/
public void setResources(WebResourceRoot resources) {
this.resources = resources;
@@ -461,7 +463,7 @@ public abstract class WebappClassLoaderB
/**
- * Return the context name for this class loader.
+ * @return the context name for this class loader.
*/
public String getContextName() {
if (resources == null) {
@@ -474,6 +476,8 @@ public abstract class WebappClassLoaderB
/**
* Return the "delegate first" flag for this class loader.
+ * @return true if the class lookup will delegate to
+ * the parent first. The default in Tomcat is false.
*/
public boolean getDelegate() {
@@ -560,6 +564,8 @@ public abstract class WebappClassLoaderB
/**
* Return the clearReferencesStatic flag for this Context.
+ * @return true if the classloader should attempt to set to
null
+ *static final fields in loaded classes
*/
public boolean getClearReferencesStatic() {
return (this.clearReferencesStatic);
@@ -577,7 +583,7 @@ public abstract class WebappClassLoaderB
/**
- * Return the clearReferencesStopThreads flag for this Context.
+ * @return the clearReferencesStopThreads flag for this Context.
*/
public boolean getClearReferencesStopThreads() {
return (this.clearReferencesStopThreads);
@@ -596,7 +602,7 @@ public abstract class WebappClassLoaderB
/**
- * Return the clearReferencesStopTimerThreads flag for this Context.
+ * @return the clearReferencesStopTimerThreads flag for this Context.
*/
public boolean getClearReferencesStopTimerThreads() {
return (this.clearReferencesStopTimerThreads);
@@ -615,7 +621,7 @@ public abstract class WebappClassLoaderB
/**
- * Return the clearReferencesLogFactoryRelease flag for this Context.
+ * @return the clearReferencesLogFactoryRelease flag for this Context.
*/
public boolean getClearReferencesLogFactoryRelease() {
return (this.clearReferencesLogFactoryRelease);
@@ -635,7 +641,7 @@ public abstract class WebappClassLoaderB
/**
- * Return the clearReferencesHttpClientKeepAliveThread flag for this
+ * @return the clearReferencesHttpClientKeepAliveThread flag for this
* Context.
*/
public boolean getClearReferencesHttpClientKeepAliveThread() {
@@ -726,6 +732,7 @@ public abstract class WebappClassLoaderB
/**
* Have one or more classes or resources been modified so that a reload
* is appropriate?
+ * @return true if there's been a modification
*/
public boolean modified() {
@@ -782,9 +789,6 @@ public abstract class WebappClassLoaderB
}
-/**
- * Render a String representation of this object.
- */
@Override
public String toString() {
@@ -812,9 +816,7 @@ public abstract class WebappClassLoaderB
// ClassLoader Methods
-/**
- * Expose this method for use by the unit tests.
- */
+// Note: exposed for use by tests
[Bug 58835] New: wrong shutdown for websockets
https://bz.apache.org/bugzilla/show_bug.cgi?id=58835 Bug ID: 58835 Summary: wrong shutdown for websockets Product: Tomcat 9 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: WebSocket Assignee: dev@tomcat.apache.org Reporter: publicoce...@gmail.com When the container shutdowns , it commands directly to close all the sockets. It is a too much simply solution. You might add a handler before to do it , i could make particolar things before to close sockets , for example sending a final message with particular informations (Business logic status) Developers would have the possibility to handle the shutdown phase. In tomcat 9 , it closes abrubtly all the sockets, in tomcat 8 , it was better in this case , but when you are sending a message before to close a socket , it throws a exception because it dont flush the previous messages. The solution for me is simply to flush messages enqueued before to close and add a callback onShutdown -- 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 58836] New: Query string parameters w/o values are not sent to dest servlet via request.getRequestDispatcher().forward()
https://bz.apache.org/bugzilla/show_bug.cgi?id=58836
Bug ID: 58836
Summary: Query string parameters w/o values are not sent to
dest servlet via
request.getRequestDispatcher().forward()
Product: Tomcat 8
Version: 8.0.28
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: safepassi...@gmail.com
URL / query string parameters with no value (technically keyless values) are
not received by the destination servlet when using
request.getRequestDispatcher().forward().
Example:
request.getRequestDispatcher("/newpage?P1=1&P2").forward(request,response);
The servlet handling /newpage will have P1 in the request parameter list but
not P2 even though both parameters are in the query string verified with
request.getQueryString(). The order and quantity of parameters doesn't seem to
make a difference, those without values are not seen by the servlet, while
those with values (or even with just an = but no value) are.
I believe the cause may be in ApplicationHttpRequest.mergeParameters().
Possibly the line "if (value == null)" should be replaced with if
(queryParameters.containsKey(key)) (among other things), but I'm not 100% on
that, building and debugging Tomcat is beyond my capabilities at this point.
I have a pair of test servlets that show this behavior on my development server
if somebody wants to see it in action. Email me safepassing2/gmail_com and
I'll provide the address.
--
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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-nio2 (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-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 4 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 41 mins 53 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-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-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-20160112.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160112/bin /openssl -Dexecute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -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
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 9 mins 32 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-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20160112/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20160112.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20160112-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20160112/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -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/workspa
svn commit: r1724156 - /tomcat/trunk/webapps/docs/config/cluster-interceptor.xml
Author: kfujino Date: Tue Jan 12 05:12:13 2016 New Revision: 1724156 URL: http://svn.apache.org/viewvc?rev=1724156&view=rev Log: Correct document of MessageDispatchInterceptor. Merge documents of MessageDispatch15Interceptor into MessageDispatchInterceptor. Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Modified: tomcat/trunk/webapps/docs/config/cluster-interceptor.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-interceptor.xml?rev=1724156&r1=1724155&r2=1724156&view=diff == --- tomcat/trunk/webapps/docs/config/cluster-interceptor.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-interceptor.xml Tue Jan 12 05:12:13 2016 @@ -44,7 +44,6 @@ org.apache.catalina.tribes.group.interceptors.TcpFailureDetector org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor - org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator org.apache.catalina.tribes.group.interceptors.OrderInterceptor @@ -108,32 +107,8 @@ - - - - Required, This dispatcher uses JDK 1.5 java.util.concurrent package - - - The default and hard coded value is 8 (org.apache.catalina.tribes.Channel.SEND_OPTIONS_ASYNCHRONOUS). - The dispatcher will trigger on this value only, as it is predefined by Tribes. - The other attributes are inherited from its base class org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor. - - - The maximum number of threads in this pool, default is 10. - - - The number of threads to keep in the pool, default is 2. - - - Maximum number of milliseconds of until Idle thread terminates. Default value is 5000(5 seconds). - - - - - Required, Same implementation as MessageDispatch15Interceptor, but with JDK 1.4 compliance. - The default and hard coded value is 8 (org.apache.catalina.tribes.Channel.SEND_OPTIONS_ASYNCHRONOUS). The dispatcher will trigger on this value only, as it is predefined by Tribes. @@ -147,6 +122,15 @@ if the queue fills up, one can trigger the behavior, if alwaysSend is set to true, the message will be sent synchronously if the flag is false, an error is thrown + + The maximum number of threads in this pool, default is 10. + + + The number of threads to keep in the pool, default is 2. + + + Maximum number of milliseconds of until Idle thread terminates. Default value is 5000(5 seconds). + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724158 - /tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
Author: kfujino
Date: Tue Jan 12 05:24:42 2016
New Revision: 1724158
URL: http://svn.apache.org/viewvc?rev=1724158&view=rev
Log:
Ensure that asynchronous session replication thread is a daemon thread.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java?rev=1724158&r1=1724157&r2=1724158&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
Tue Jan 12 05:24:42 2016
@@ -63,6 +63,7 @@ public class TcclThreadFactory implement
} else {
t.setContextClassLoader(this.getClass().getClassLoader());
}
+t.setDaemon(true);
return t;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724159 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/tribes/util/TcclThreadFactory.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Jan 12 05:25:37 2016
New Revision: 1724159
URL: http://svn.apache.org/viewvc?rev=1724159&view=rev
Log:
Ensure that asynchronous session replication thread is a daemon thread.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java?rev=1724159&r1=1724158&r2=1724159&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
Tue Jan 12 05:25:37 2016
@@ -63,6 +63,7 @@ public class TcclThreadFactory implement
} else {
t.setContextClassLoader(this.getClass().getClassLoader());
}
+t.setDaemon(true);
return t;
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1724159&r1=1724158&r2=1724159&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Jan 12 05:25:37 2016
@@ -194,6 +194,10 @@
Add support for the shutdown notification of local members in the
static
cluster. (kfujino)
+
+Ensure that asynchronous session replication thread is a daemon thread.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724160 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/tribes/util/TcclThreadFactory.java webapps/docs/changelog.xml
Author: kfujino
Date: Tue Jan 12 05:26:27 2016
New Revision: 1724160
URL: http://svn.apache.org/viewvc?rev=1724160&view=rev
Log:
Ensure that asynchronous session replication thread is a daemon thread.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java?rev=1724160&r1=1724159&r2=1724160&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/util/TcclThreadFactory.java
Tue Jan 12 05:26:27 2016
@@ -64,6 +64,7 @@ public class TcclThreadFactory implement
} else {
t.setContextClassLoader(this.getClass().getClassLoader());
}
+t.setDaemon(true);
return t;
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1724160&r1=1724159&r2=1724160&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 12 05:26:27 2016
@@ -187,6 +187,10 @@
Add support for the shutdown notification of local members in the
static
cluster. (kfujino)
+
+Ensure that asynchronous session replication thread is a daemon thread.
+(kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724161 - /tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: kfujino
Date: Tue Jan 12 05:32:23 2016
New Revision: 1724161
URL: http://svn.apache.org/viewvc?rev=1724161&view=rev
Log:
No functional change.
Use the backup members value from a local variable.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1724161&r1=1724160&r2=1724161&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue
Jan 12 05:32:23 2016
@@ -140,7 +140,7 @@ public class ReplicatedMap extends
MapMessage msg = new MapMessage(getMapContextName(),
MapMessage.MSG_COPY, false,
(Serializable) key, (Serializable) value,
null,channel.getLocalMember(false), backup);
-getChannel().send(getMapMembers(), msg, getChannelSendOptions());
+getChannel().send(backup, msg, getChannelSendOptions());
} catch (ChannelException e) {
FaultyMember[] faultyMembers = e.getFaultyMembers();
if (faultyMembers.length == 0) throw e;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724162 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: kfujino
Date: Tue Jan 12 05:33:06 2016
New Revision: 1724162
URL: http://svn.apache.org/viewvc?rev=1724162&view=rev
Log:
No functional change.
Use the backup members value from a local variable.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1724162&r1=1724161&r2=1724162&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Tue Jan 12 05:33:06 2016
@@ -140,7 +140,7 @@ public class ReplicatedMap extends
MapMessage msg = new MapMessage(getMapContextName(),
MapMessage.MSG_COPY, false,
(Serializable) key, (Serializable) value,
null,channel.getLocalMember(false), backup);
-getChannel().send(getMapMembers(), msg, getChannelSendOptions());
+getChannel().send(backup, msg, getChannelSendOptions());
} catch (ChannelException e) {
FaultyMember[] faultyMembers = e.getFaultyMembers();
if (faultyMembers.length == 0) throw e;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724163 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Author: kfujino
Date: Tue Jan 12 05:33:48 2016
New Revision: 1724163
URL: http://svn.apache.org/viewvc?rev=1724163&view=rev
Log:
No functional change.
Use the backup members value from a local variable.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1724163&r1=1724162&r2=1724163&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Tue Jan 12 05:33:48 2016
@@ -142,7 +142,7 @@ public class ReplicatedMap extends
MapMessage msg = new MapMessage(getMapContextName(),
MapMessage.MSG_COPY, false,
(Serializable) key, (Serializable) value,
null,channel.getLocalMember(false), backup);
-getChannel().send(getMapMembers(), msg, getChannelSendOptions());
+getChannel().send(backup, msg, getChannelSendOptions());
} catch (ChannelException e) {
FaultyMember[] faultyMembers = e.getFaultyMembers();
if (faultyMembers.length == 0) throw e;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724164 - /tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
Author: kfujino
Date: Tue Jan 12 05:38:26 2016
New Revision: 1724164
URL: http://svn.apache.org/viewvc?rev=1724164&view=rev
Log:
No functional change.
Remove package. It already has been imported.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1724164&r1=1724163&r2=1724164&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Jan 12
05:38:26 2016
@@ -71,7 +71,7 @@ public final class UniqueId implements S
@Override
public String toString() {
StringBuilder buf = new StringBuilder("UniqueId");
-buf.append(org.apache.catalina.tribes.util.Arrays.toString(id));
+buf.append(Arrays.toString(id));
return buf.toString();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724165 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
Author: kfujino
Date: Tue Jan 12 05:39:30 2016
New Revision: 1724165
URL: http://svn.apache.org/viewvc?rev=1724165&view=rev
Log:
No functional change.
Remove package. It already has been imported.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1724165&r1=1724164&r2=1724165&view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Jan
12 05:39:30 2016
@@ -71,7 +71,7 @@ public final class UniqueId implements S
@Override
public String toString() {
StringBuilder buf = new StringBuilder("UniqueId");
-buf.append(org.apache.catalina.tribes.util.Arrays.toString(id));
+buf.append(Arrays.toString(id));
return buf.toString();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724167 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
Author: kfujino
Date: Tue Jan 12 05:40:12 2016
New Revision: 1724167
URL: http://svn.apache.org/viewvc?rev=1724167&view=rev
Log:
No functional change.
Remove package. It already has been imported.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=1724167&r1=1724166&r2=1724167&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/UniqueId.java Tue Jan
12 05:40:12 2016
@@ -71,7 +71,7 @@ public final class UniqueId implements S
@Override
public String toString() {
StringBuilder buf = new StringBuilder("UniqueId");
-buf.append(org.apache.catalina.tribes.util.Arrays.toString(id));
+buf.append(Arrays.toString(id));
return buf.toString();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1724168 - /tomcat/trunk/webapps/docs/cluster-howto.xml
Author: kfujino Date: Tue Jan 12 05:44:35 2016 New Revision: 1724168 URL: http://svn.apache.org/viewvc?rev=1724168&view=rev Log: Fix cluster-howto docs. Modified: tomcat/trunk/webapps/docs/cluster-howto.xml Modified: tomcat/trunk/webapps/docs/cluster-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=1724168&r1=1724167&r2=1724168&view=diff == --- tomcat/trunk/webapps/docs/cluster-howto.xml (original) +++ tomcat/trunk/webapps/docs/cluster-howto.xml Tue Jan 12 05:44:35 2016 @@ -64,7 +64,7 @@ The IP broadcasted is java.net.InetAddress.getLocalHost().getHostAddress() (make sure you don't broadcast 127.0.0.1, this is a common error) The TCP port listening for replication messages is the first available server socket in range 4000-4100 Listener is configured ClusterSessionListener -Two interceptors are configured TcpFailureDetector and MessageDispatch15Interceptor +Two interceptors are configured TcpFailureDetector and MessageDispatchInterceptor The following is the default cluster configuration: @@ -93,7 +93,7 @@ - + - + @@ -359,7 +359,7 @@ should be completed: For more info, Please visit the reference documentation @@ -368,7 +368,7 @@ should be completed: Using interceptors, logic can be broken into more manageable pieces of code. The interceptors configured above are: TcpFailureDetector - verifies crashed members through TCP, if multicast packets get dropped, this interceptor protects against false positives, ie the node marked as crashed even though it still is alive and running. -MessageDispatch15Interceptor - dispatches messages to a thread (thread pool) to send message asynchronously. +MessageDispatchInterceptor - dispatches messages to a thread (thread pool) to send message asynchronously. ThroughputInterceptor - prints out simple stats on message traffic. Please note that the order of interceptors is important. The way they are defined in server.xml is the way they are represented in the channel stack. Think of it as a linked list, with the head being the first most interceptor and the tail the last. - 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-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/398 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] 1724165 Blamelist: kfujino 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
[Bug 58837] New: support "X-Content-Security-Policy" a.k.a as "CSP"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58837 Bug ID: 58837 Summary: support "X-Content-Security-Policy" a.k.a as "CSP" Product: Tomcat 8 Version: trunk Hardware: PC OS: Windows NT Status: NEW Severity: enhancement Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: hau...@acm.org see also https://www.owasp.org/index.php/Content_Security_Policy - http://w3c.github.io/webappsec-csp/ - http://www.html5rocks.com/en/tutorials/security/content-security-policy/ -- 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
