Author: markt
Date: Sat Dec 22 22:12:17 2012
New Revision: 1425355
URL: http://svn.apache.org/viewvc?rev=1425355&view=rev
Log:
Update the examples to use the v011 API
Removed:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpointConfiguration.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java?rev=1425355&r1=1425354&r2=1425355&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java
Sat Dec 22 22:12:17 2012
@@ -23,9 +23,9 @@ import java.util.concurrent.atomic.Atomi
import javax.websocket.Session;
import javax.websocket.WebSocketClose;
-import javax.websocket.WebSocketEndpoint;
import javax.websocket.WebSocketMessage;
import javax.websocket.WebSocketOpen;
+import javax.websocket.server.WebSocketEndpoint;
import util.HTMLFilter;
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java?rev=1425355&r1=1425354&r2=1425355&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java
Sat Dec 22 22:12:17 2012
@@ -18,8 +18,8 @@ package websocket.echo;
import java.nio.ByteBuffer;
-import javax.websocket.WebSocketEndpoint;
import javax.websocket.WebSocketMessage;
+import javax.websocket.server.WebSocketEndpoint;
@WebSocketEndpoint("/websocket/echoAnnotation")
public class EchoAnnotation {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1425355&r1=1425354&r2=1425355&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java
Sat Dec 22 22:12:17 2012
@@ -21,23 +21,21 @@ import java.io.IOException;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
import javax.websocket.Endpoint;
+import javax.websocket.EndpointConfiguration;
import javax.websocket.MessageHandler;
import javax.websocket.RemoteEndpoint;
import javax.websocket.Session;
public class EchoEndpoint extends Endpoint{
- private Session session;
-
@Override
- public void onOpen(Session session) {
- this.session = session;
+ public void onOpen(Session session, EndpointConfiguration endpointConfig) {
RemoteEndpoint remoteEndpoint = session.getRemote();
session.addMessageHandler(new EchoMessageHandler(remoteEndpoint));
}
@Override
- public void onClose(CloseReason closeReason) {
+ public void onClose(Session session, CloseReason closeReason) {
try {
session.close(new CloseReason(CloseCodes.NORMAL_CLOSURE, null));
} catch (IOException e) {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java?rev=1425355&r1=1425354&r2=1425355&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Sat Dec 22 22:12:17 2012
@@ -19,8 +19,8 @@ package websocket.echo;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.servlet.annotation.WebListener;
-import javax.websocket.ContainerProvider;
import javax.websocket.DeploymentException;
+import javax.websocket.server.DefaultServerConfiguration;
import org.apache.tomcat.websocket.ServerContainerImpl;
@@ -29,11 +29,11 @@ public class WsConfigListener implements
@Override
public void contextInitialized(ServletContextEvent sce) {
- ServerContainerImpl sc =
- (ServerContainerImpl) ContainerProvider.getServerContainer();
+ ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(sce.getServletContext());
try {
- sc.publishServer(EchoEndpointConfiguration.class);
+ sc.publishServer(EchoEndpoint.class, "/websocket/echoProgrammatic",
+ DefaultServerConfiguration.class);
} catch (DeploymentException e) {
throw new IllegalStateException(e);
}
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java?rev=1425355&r1=1425354&r2=1425355&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java
Sat Dec 22 22:12:17 2012
@@ -23,9 +23,9 @@ import java.util.concurrent.atomic.Atomi
import javax.websocket.Session;
import javax.websocket.WebSocketClose;
-import javax.websocket.WebSocketEndpoint;
import javax.websocket.WebSocketMessage;
import javax.websocket.WebSocketOpen;
+import javax.websocket.server.WebSocketEndpoint;
@WebSocketEndpoint(value = "/websocket/snake")
public class SnakeAnnotation {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
