Author: markt
Date: Thu Sep 19 11:05:27 2013
New Revision: 1524690
URL: http://svn.apache.org/r1524690
Log:
WsListener->WsContextListener to more clearly differentiate between it and
WsSessionListener
Added:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
- copied, changed from r1524688,
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
Removed:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1524657
Copied:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
(from r1524688,
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsListener.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java&p1=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsListener.java&r1=1524688&r2=1524690&rev=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/WsContextListener.java
Thu Sep 19 11:05:27 2013
@@ -26,7 +26,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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
Thu Sep 19 11:05:27 2013
@@ -43,7 +43,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Thu Sep 19 11:05:27 2013
@@ -58,7 +58,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 {
@@ -443,7 +443,7 @@ public class TestWsWebSocketContainer ex
}
- public static class BlockingConfig extends WsListener {
+ public static class BlockingConfig extends WsContextListener {
public static final String PATH = "/block";
@@ -556,7 +556,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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
Thu Sep 19 11:05:27 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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
Thu Sep 19 11:05:27 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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
Thu Sep 19 11:05:27 2013
@@ -57,7 +57,7 @@ import org.apache.catalina.startup.Tomca
import org.apache.catalina.startup.TomcatBaseTest;
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 {
@@ -418,7 +418,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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
Thu Sep 19 11:05:27 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/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1524690&r1=1524689&r2=1524690&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
Thu Sep 19 11:05:27 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
