Author: kpreisser
Date: Wed Oct 16 13:55:06 2013
New Revision: 1532765
URL: http://svn.apache.org/r1532765
Log:
Restore the ServletContextListener for the Drawboard example to be able to
shutdown the Room (dispose of Graphics2D) when the Context is destroyed.
Added:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java
- copied, changed from r1531600,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java
Modified:
tomcat/trunk/webapps/examples/WEB-INF/web.xml
Copied:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java
(from r1531600,
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java?p2=tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java&p1=tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java&r1=1531600&r2=1532765&rev=1532765&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java
Wed Oct 16 13:55:06 2013
@@ -18,26 +18,12 @@ package websocket.drawboard;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-@WebListener
-public final class WsConfigListener implements ServletContextListener {
+public final class DrawboardContextListener implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
-
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
- "javax.websocket.server.ServerContainer");
- try {
- sc.addEndpoint(ServerEndpointConfig.Builder.create(
- DrawboardEndpoint.class, "/websocket/drawboard").build());
- } catch (DeploymentException e) {
- throw new IllegalStateException(e);
- }
+ // NO-OP
}
@Override
Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1532765&r1=1532764&r2=1532765&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Wed Oct 16 13:55:06 2013
@@ -394,4 +394,9 @@
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
+ <!-- Websocket examples -->
+ <listener>
+
<listener-class>websocket.drawboard.DrawboardContextListener</listener-class>
+ </listener>
+
</web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
