Author: markt Date: Thu Sep 19 08:44:45 2013 New Revision: 1524657 URL: http://svn.apache.org/r1524657 Log: WsListener->WsContextListener to more clearly differentiate between it and WsSessionListener
Added: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java - copied, changed from r1524646, tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java Removed: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Copied: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java (from r1524646, tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java&r1=1524646&r2=1524657&rev=1524657&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsListener.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java Thu Sep 19 08:44:45 2013 @@ -27,7 +27,7 @@ import javax.servlet.ServletContextListe * {@link javax.servlet.ServletContext} that uses WebSocket to bootstrap the * {@link WsServerContainer} correctly. */ -public class WsListener implements ServletContextListener { +public class WsContextListener implements ServletContextListener { @Override public void contextInitialized(ServletContextEvent sce) { Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Thu Sep 19 08:44:45 2013 @@ -43,7 +43,7 @@ import org.apache.tomcat.util.descriptor import org.apache.tomcat.util.descriptor.web.LoginConfig; import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityConstraint; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; /* * Test FORM authentication for sessions that do and do not use cookies. @@ -649,7 +649,7 @@ public class TestFormAuthenticator exten setUseCookies(clientShouldUseCookies); ctx.setCookies(serverShouldUseCookies); ctx.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); TesterMapRealm realm = new TesterMapRealm(); realm.addUser("tomcat", "tomcat"); Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java (original) +++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Thu Sep 19 08:44:45 2013 @@ -44,7 +44,7 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.descriptor.web.ApplicationListener; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestDefaultServlet extends TomcatBaseTest { @@ -103,7 +103,7 @@ public class TestDefaultServlet extends org.apache.catalina.Context ctx = tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); ctx.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); // Override the default servlet with our own mappings Tomcat.addServlet(ctx, "default2", new DefaultServlet()); Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java (original) +++ tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Thu Sep 19 08:44:45 2013 @@ -31,7 +31,7 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.descriptor.web.ApplicationListener; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestWebdavServlet extends TomcatBaseTest { @@ -96,7 +96,7 @@ public class TestWebdavServlet extends T Tomcat.addServlet(ctx, "webdav", new WebdavServlet()); ctx.addServletMapping("/webdav/*", "webdav"); ctx.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); tomcat.start(); Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Sep 19 08:44:45 2013 @@ -46,7 +46,7 @@ import org.apache.tomcat.util.buf.ByteCh import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; import org.apache.tomcat.util.descriptor.web.ContextResourceLink; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestTomcat extends TomcatBaseTest { @@ -220,7 +220,7 @@ public class TestTomcat extends TomcatBa org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + @@ -237,7 +237,7 @@ public class TestTomcat extends TomcatBa org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); tomcat.start(); @@ -358,7 +358,7 @@ public class TestTomcat extends TomcatBa org.apache.catalina.Context ctx = tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); ctx.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); Tomcat.addServlet(ctx, "testGetResource", new GetResource()); ctx.addServletMapping("/testGetResource", "testGetResource"); Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Thu Sep 19 08:44:45 2013 @@ -36,7 +36,7 @@ import org.apache.coyote.http11.Abstract import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; /** * The keys and certificates used in this file are all available in svn and were @@ -76,7 +76,7 @@ public class TestCustomSsl extends Tomca Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); tomcat.start(); ByteChunk res = getUrl("https://localhost:" + getPort() + Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Sep 19 08:44:45 2013 @@ -40,7 +40,7 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.descriptor.web.ApplicationListener; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; /** * The keys and certificates used in this file are all available in svn and were @@ -59,7 +59,7 @@ public class TestSsl extends TomcatBaseT org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); TesterSupport.initSsl(tomcat); @@ -79,7 +79,7 @@ public class TestSsl extends TomcatBaseT org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); TesterSupport.initSsl(tomcat, "localhost-copy1.jks", "changeit", "tomcatpass"); @@ -174,7 +174,7 @@ public class TestSsl extends TomcatBaseT Context ctxt = tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); ctxt.addApplicationListener(new ApplicationListener( - WsListener.class.getName(), false)); + WsContextListener.class.getName(), false)); TesterSupport.initSsl(tomcat); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Thu Sep 19 08:44:45 2013 @@ -43,7 +43,7 @@ import org.apache.catalina.startup.Tomca import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; import org.apache.tomcat.websocket.server.Constants; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestWsSubprotocols extends TomcatBaseTest { @@ -104,7 +104,7 @@ public class TestWsSubprotocols extends } - public static class Config extends WsListener { + public static class Config extends WsContextListener { @Override public void contextInitialized(ServletContextEvent sce) { super.contextInitialized(sce); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Thu Sep 19 08:44:45 2013 @@ -56,7 +56,7 @@ import org.apache.tomcat.websocket.Teste import org.apache.tomcat.websocket.TesterMessageCountClient.TesterEndpoint; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; import org.apache.tomcat.websocket.server.Constants; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestWsWebSocketContainer extends TomcatBaseTest { @@ -441,7 +441,7 @@ public class TestWsWebSocketContainer ex } - public static class BlockingConfig extends WsListener { + public static class BlockingConfig extends WsContextListener { public static final String PATH = "/block"; @@ -552,7 +552,7 @@ public class TestWsWebSocketContainer ex } - public static class ConstantTxConfig extends WsListener { + public static class ConstantTxConfig extends WsContextListener { private static final String PATH = "/test"; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java Thu Sep 19 08:44:45 2013 @@ -27,11 +27,11 @@ import javax.websocket.server.ServerCont import javax.websocket.server.ServerEndpoint; import org.apache.tomcat.websocket.server.Constants; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TesterEchoServer { - public static class Config extends WsListener { + public static class Config extends WsContextListener { public static final String PATH_ASYNC = "/echoAsync"; public static final String PATH_BASIC = "/echoBasic"; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java Thu Sep 19 08:44:45 2013 @@ -27,7 +27,7 @@ import javax.websocket.server.ServerCont import javax.websocket.server.ServerEndpoint; import org.apache.tomcat.websocket.server.Constants; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; /** * Sends {@link #MESSAGE_COUNT} messages of size {@link #MESSAGE_SIZE} bytes as @@ -49,7 +49,7 @@ public class TesterFirehoseServer { } - public static class Config extends WsListener { + public static class Config extends WsContextListener { public static final String PATH = "/firehose"; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Sep 19 08:44:45 2013 @@ -57,7 +57,7 @@ import org.apache.catalina.startup.Tomca import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.pojo.TesterUtil.ServerConfigListener; import org.apache.tomcat.websocket.pojo.TesterUtil.SingletonConfigurator; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TestEncodingDecoding extends TomcatBaseTest { @@ -414,7 +414,7 @@ public class TestEncodingDecoding extend } - public static class ProgramaticServerEndpointConfig extends WsListener { + public static class ProgramaticServerEndpointConfig extends WsContextListener { @Override public void contextInitialized(ServletContextEvent sce) { Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java Thu Sep 19 08:44:45 2013 @@ -23,11 +23,11 @@ import javax.websocket.server.ServerCont import javax.websocket.server.ServerEndpointConfig.Configurator; import org.apache.tomcat.websocket.server.Constants; -import org.apache.tomcat.websocket.server.WsListener; +import org.apache.tomcat.websocket.server.WsContextListener; public class TesterUtil { - public static class ServerConfigListener extends WsListener { + public static class ServerConfigListener extends WsContextListener { private static Class<?> pojoClazz; Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1524657&r1=1524656&r2=1524657&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Thu Sep 19 08:44:45 2013 @@ -53,7 +53,7 @@ public class TestWsServerContainer exten } - public static class Bug54807Config extends WsListener { + public static class Bug54807Config extends WsContextListener { @Override public void contextInitialized(ServletContextEvent sce) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org