Author: markt
Date: Tue Oct 15 11:07:03 2013
New Revision: 1532288
URL: http://svn.apache.org/r1532288
Log:
Refactor WebSocket examples to only require the SCI
Added:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
- copied, changed from r1532286,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Removed:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1532286
Copied:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(from r1532286,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?p2=tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java&p1=tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java&r1=1532286&r2=1532288&rev=1532288&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java
Tue Oct 15 11:07:03 2013
@@ -32,7 +32,7 @@ public class ExamplesConfig implements S
public Set<ServerEndpointConfig> getEndpointConfigs(
Set<Class<? extends Endpoint>> scanned) {
- Set<ServerEndpointConfig> result = new HashSet<>();
+ Set<ServerEndpointConfig> result = new HashSet<ServerEndpointConfig>();
if (scanned.contains(EchoEndpoint.class)) {
result.add(ServerEndpointConfig.Builder.create(
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1532288&r1=1532287&r2=1532288&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Tue Oct 15 11:07:03 2013
@@ -24,7 +24,7 @@ import javax.websocket.MessageHandler;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
-public class EchoEndpoint extends Endpoint{
+public class EchoEndpoint extends Endpoint {
@Override
public void onOpen(Session session, EndpointConfig endpointConfig) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
