You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/06/17 22:52:52 UTC
svn commit: r1603290 - in /tomcat/trunk/webapps/examples:
WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java websocket/echo.xhtml
Author: markt
Date: Tue Jun 17 20:52:51 2014
New Revision: 1603290
URL: http://svn.apache.org/r1603290
Log:
Disable async echo endpoint again until we can put in some configurable limits on message size to buffer.
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
tomcat/trunk/webapps/examples/websocket/echo.xhtml
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java?rev=1603290&r1=1603289&r2=1603290&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java Tue Jun 17 20:52:51 2014
@@ -27,7 +27,6 @@ import java.util.concurrent.TimeoutExcep
import javax.websocket.OnMessage;
import javax.websocket.PongMessage;
import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
/**
* The three annotated echo endpoints can be used to test with Autobahn and
@@ -37,7 +36,7 @@ import javax.websocket.server.ServerEndp
* Note: This one is disabled by default since it allocates memory, and needs
* to be enabled back.
*/
-@ServerEndpoint("/websocket/echoAsyncAnnotation")
+//@javax.websocket.server.ServerEndpoint("/websocket/echoAsyncAnnotation")
public class EchoAsyncAnnotation {
private static final Future<Void> COMPLETED = new CompletedFuture();
Modified: tomcat/trunk/webapps/examples/websocket/echo.xhtml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/echo.xhtml?rev=1603290&r1=1603289&r2=1603290&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/websocket/echo.xhtml (original)
+++ tomcat/trunk/webapps/examples/websocket/echo.xhtml Tue Jun 17 20:52:51 2014
@@ -156,8 +156,11 @@
onclick="updateTarget(this.value);"/> <label for="radio3">annotation API (stream)</label>
<br/>
<!-- echo example using new annotation API on the server side -->
+ <!-- Disabled by default -->
+ <!--
<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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org