Author: markt
Date: Wed Mar 9 11:11:15 2016
New Revision: 1734219
URL: http://svn.apache.org/viewvc?rev=1734219&view=rev
Log:
Update presentation info
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=1734219&r1=1734218&r2=1734219&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Mar 9 11:11:15 2016
@@ -221,20 +221,7 @@ presentations then please do let us know
<h4 id="Scheduled_presentations">Scheduled presentations</h4>
<div class="text">
-<p>Connector selection: BIO vs NIO vs NIO2 vs APR (markt)</p>
-
-<ul>
-
-<li>Webinar: Tuesday 16 February 2016
- <a href="http://markmail.org/message/eik4vkgpbeqcrjoa";>10.00 UTC</a>
-</li>
-
-<li>Webinar: Tuesday 16 February 2016
- <a href="http://markmail.org/message/spsil2dv7afmohwp";>20.00 UTC</a>
-</li>
-
-</ul>
-
+<p>TBD</p>
</div>
</div>
@@ -278,6 +265,9 @@ mailing list</a>.</p>
<ul>
+<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a>
+</li>
+
<li>TLS key/certificate generation (markt) <a
href="https://www.youtube.com/watch?v=I6TbMqH9WFg";>video</a>,
<a
href="http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt";>script</a>
</li>
@@ -320,6 +310,18 @@ mailing list</a>.</p>
<li>Tomcat Clustering: Part 3 - Clustering (markt) <a
href="2015-04-15-Tomcat-clustering-part-3-clustering.pdf">slides</a>
</li>
+
+<li>
+ Load-balancing Tomcat with mod_jk - Christopher Schultz,
+ <a
href="http://home.apache.org/~schultz/ApacheCon%20NA%202015/Load-balancing%20Tomcat%20with%20mod_jk.pdf";>slides</a>
+
+</li>
+
+<li>
+ Monitoring Apache Tomcat with JMX - Christopher Schultz,
+ <a
href="http://home.apache.org/~schultz/ApacheCon%20NA%202015/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf";>slides</a>
+
+</li>
</ul>
@@ -339,7 +341,7 @@ mailing list</a>.</p>
</li>
<li>Monitoring Apache Tomcat – Christopher Schultz,
- slides not available,
+ <a
href="http://home.apache.org/~schultz/ApacheCon%20NA%202014/Monitoring%20Apache%20Tomcat%20with%20JMX.pdf";>slides</a>,
<a
href="http://feathercast.apache.org/podcasts/ApacheConNA2014/blake/Blake_15_Christopher-Schultz.mp3";>audio</a>
</li>
Modified: tomcat/site/trunk/xdocs/presentations.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/presentations.xml?rev=1734219&r1=1734218&r2=1734219&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/presentations.xml (original)
+++ tomcat/site/trunk/xdocs/presentations.xml Wed Mar 9 11:11:15 2016
@@ -16,14 +16,7 @@ presentations then please do let us know
<a href="lists.html#tomcat-users">Tomcat Users mailing list</a>.</p>
<subsection name="Scheduled presentations">
-<p>Connector selection: BIO vs NIO vs NIO2 vs APR (markt)</p>
-<ul>
- <li>Webinar: Tuesday 16 February 2016
- <a href="http://markmail.org/message/eik4vkgpbeqcrjoa";>10.00 UTC</a></li>
- <li>Webinar: Tuesday 16 February 2016
- <a href="http://markmail.org/message/spsil2dv7afmohwp";>20.00 UTC</a></li>
-</ul>
-
+<p>TBD</p>
</subsection>
<subsection name="Future Topics">
@@ -44,6 +37,7 @@ mailing list</a>.</p>
<subsection name="Webinar Series 2016">
<ul>
+<li>Connector selection: BIO vs NIO vs NIO2 vs APR (markt) <a
href="https://www.youtube.com/watch?v=LBSWixIwMmU";>video</a></li>
<li>TLS key/certificate generation (markt) <a
href="https://www.youtube.com/watch?v=I6TbMqH9WFg";>video</a>,
<a
href="http://home.apache.org/~markt/presentations/2016-01-25-TLS-key-certificate-generation/script.txt";>script</a></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
