Author: markt
Date: Mon Mar 19 09:47:32 2012
New Revision: 1302349
URL: http://svn.apache.org/viewvc?rev=1302349&view=rev
Log:
Port websocket updates
Added:
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
- copied, changed from r1300997,
tomcat/trunk/webapps/docs/web-socket-howto.xml
tomcat/tc7.0.x/trunk/webapps/examples/websocket/chat.html
- copied unchanged from r1302332,
tomcat/trunk/webapps/examples/websocket/chat.html
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/project.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1300997,1301006,1302332,1302348
Modified: tomcat/tc7.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/index.xml?rev=1302349&r1=1302348&r2=1302349&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Mon Mar 19 09:47:32 2012
@@ -135,6 +135,8 @@ Apache Tomcat 7, and using many of the A
Configuring Tomcat to use integrated Windows authentication.</li>
<li><a href="jdbc-pool.html"><strong>High Concurrency JDBC Pool</strong></a> -
Configuring Tomcat to use an alternative JDBC pool.</li>
+<li><a href="web-socket-howto.html"><strong>WebSocket support</strong></a> -
+ Developing WebSocket applications for Apache Tomcat.</li>
</ol>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/project.xml?rev=1302349&r1=1302348&r2=1302349&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Mon Mar 19 09:47:32 2012
@@ -72,6 +72,7 @@
href="windows-auth-howto.html"/>
<item name="31) Tomcat's JDBC Pool"
href="jdbc-pool.html"/>
+ <item name="32) WebSocket" href="web-socket-howto.html"/>
</menu>
<menu name="Reference">
Copied: tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml (from r1300997,
tomcat/trunk/webapps/docs/web-socket-howto.xml)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml?p2=tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml&p1=tomcat/trunk/webapps/docs/web-socket-howto.xml&r1=1300997&r2=1302349&rev=1302349&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml Mon Mar 19 09:47:32
2012
@@ -48,9 +48,11 @@
than document something here that will quickly be out of date, please see
the
Javadoc for the
<a href="api/index.html?org/apache/catalina/websocket/package-summary.html">
- <code>org.apache.catalina.websocket</code></a> package. To
- view this locally, you'll need to to install the full-docs package. You can
- also read this on the Apache Tomcat website. Start with the
+ <code>org.apache.catalina.websocket</code></a> package. The Javadoc
+ pages are not included with Tomcat binary distributions. To view them
+ locally you would have to download and install "Full documentation"
+ distribution, or build it from sources. You can
+ also read this on the Apache Tomcat web site. Start with the
<a
href="api/index.html?org/apache/catalina/websocket/WebSocketServlet.html">
<code>WebSocketServlet</code></a> class.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
