Author: markt
Date: Tue Jun 17 19:35:10 2014
New Revision: 1603271
URL: http://svn.apache.org/r1603271
Log:
Add the other echo endpoints
Modified:
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/examples/websocket/echo.xhtml
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1603271&r1=1603270&r2=1603271&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 17 19:35:10 2014
@@ -278,6 +278,10 @@
the examples web application from security sensitive systems be
ignored.
(markt)
</fix>
+ <add>
+ Add options for all of the WebSocket echo endpoints to the WebSocket
+ echo example in the examples web application. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/trunk/webapps/examples/websocket/echo.xhtml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/echo.xhtml?rev=1603271&r1=1603270&r2=1603271&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/websocket/echo.xhtml (original)
+++ tomcat/trunk/webapps/examples/websocket/echo.xhtml Tue Jun 17 19:35:10 2014
@@ -142,12 +142,22 @@
<div id="connect-container">
<div>
<span>Connect to service implemented using:</span>
+ <br/>
<!-- echo example using new programmatic API on the server side -->
<input id="radio1" type="radio" name="group1"
value="/examples/websocket/echoProgrammatic"
onclick="updateTarget(this.value);"/> <label
for="radio1">programmatic API</label>
+ <br/>
<!-- echo example using new annotation API on the server side -->
<input id="radio2" type="radio" name="group1"
value="/examples/websocket/echoAnnotation"
- onclick="updateTarget(this.value);"/> <label
for="radio2">annotation API</label>
+ onclick="updateTarget(this.value);"/> <label
for="radio2">annotation API (basic)</label>
+ <br/>
+ <!-- echo example using new annotation API on the server side -->
+ <input id="radio3" type="radio" name="group1"
value="/examples/websocket/echoStreamAnnotation"
+ onclick="updateTarget(this.value);"/> <label
for="radio3">annotation API (stream)</label>
+ <br/>
+ <!-- echo example using new annotation API on the server side -->
+ <input id="radio4" type="radio" name="group1"
value="/examples/websocket/echoAsyncAnnotation"
+ onclick="updateTarget(this.value);"/> <label
for="radio4">annotation API (async)</label>
</div>
<div>
<input id="target" type="text" size="40" style="width: 350px"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
