Author: markt
Date: Sat Nov 24 17:39:48 2012
New Revision: 1413216
URL: http://svn.apache.org/viewvc?rev=1413216&view=rev
Log:
Rename for consistency. No functional change.
Simple testing of WebSocket (the examples) works for BIO, NIO and APR
Added:
tomcat/trunk/java/org/apache/catalina/websocket/MessageHandler.java
- copied, changed from r1413215,
tomcat/trunk/java/org/apache/catalina/websocket/MessageInbound.java
Removed:
tomcat/trunk/java/org/apache/catalina/websocket/MessageInbound.java
Modified:
tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java
tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
Copied: tomcat/trunk/java/org/apache/catalina/websocket/MessageHandler.java
(from r1413215,
tomcat/trunk/java/org/apache/catalina/websocket/MessageInbound.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/MessageHandler.java?p2=tomcat/trunk/java/org/apache/catalina/websocket/MessageHandler.java&p1=tomcat/trunk/java/org/apache/catalina/websocket/MessageInbound.java&r1=1413215&r2=1413216&rev=1413216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/MessageInbound.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/MessageHandler.java Sat Nov
24 17:39:48 2012
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.res.String
* specific functionality. Applications that wish to operate on a stream basis
* rather than a message basis should use {@link StreamHandler}.
*/
-public abstract class MessageInbound extends StreamHandler {
+public abstract class MessageHandler extends StreamHandler {
private static final StringManager sm =
StringManager.getManager(Constants.Package);
Modified: tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java Sat Nov
24 17:39:48 2012
@@ -33,7 +33,7 @@ import org.apache.tomcat.util.net.Abstra
* Base implementation of the class used to process WebSocket connections based
* on streams. Applications should extend this class to provide application
* specific functionality. Applications that wish to operate on a message basis
- * rather than a stream basis should use {@link MessageInbound}.
+ * rather than a stream basis should use {@link MessageHandler}.
*/
public abstract class StreamHandler implements ProtocolHandler {
Modified: tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Sat Nov
24 17:39:48 2012
@@ -307,7 +307,7 @@ public class TestWebSocket extends Tomca
}
- private static class Bug53339WsInbound extends MessageInbound {
+ private static class Bug53339WsInbound extends MessageHandler {
public static final String TEST_MESSAGE = "Test Message";
public static final String JNDI_NAME = "Bug53339Message";
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java
Sat Nov 24 17:39:48 2012
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.Atomi
import javax.servlet.http.HttpServletRequest;
-import org.apache.catalina.websocket.MessageInbound;
+import org.apache.catalina.websocket.MessageHandler;
import org.apache.catalina.websocket.StreamHandler;
import org.apache.catalina.websocket.WebSocketServlet;
import org.apache.catalina.websocket.WsOutbound;
@@ -42,20 +42,20 @@ public class ChatWebSocketServlet extend
private static final String GUEST_PREFIX = "Guest";
private final AtomicInteger connectionIds = new AtomicInteger(0);
- private final Set<ChatMessageInbound> connections =
+ private final Set<ChatMessageHandler> connections =
new CopyOnWriteArraySet<>();
@Override
protected StreamHandler createWebSocketHandler(String subProtocol,
HttpServletRequest request) {
- return new ChatMessageInbound(connectionIds.incrementAndGet());
+ return new ChatMessageHandler(connectionIds.incrementAndGet());
}
- private final class ChatMessageInbound extends MessageInbound {
+ private final class ChatMessageHandler extends MessageHandler {
private final String nickname;
- private ChatMessageInbound(int id) {
+ private ChatMessageHandler(int id) {
this.nickname = GUEST_PREFIX + id;
}
@@ -90,7 +90,7 @@ public class ChatWebSocketServlet extend
}
private void broadcast(String message) {
- for (ChatMessageInbound connection : connections) {
+ for (ChatMessageHandler connection : connections) {
try {
CharBuffer buffer = CharBuffer.wrap(message);
connection.getWsOutbound().writeTextMessage(buffer);
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java
Sat Nov 24 17:39:48 2012
@@ -23,7 +23,7 @@ import java.nio.CharBuffer;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.catalina.websocket.MessageInbound;
+import org.apache.catalina.websocket.MessageHandler;
import org.apache.catalina.websocket.StreamHandler;
import org.apache.catalina.websocket.WebSocketServlet;
@@ -65,7 +65,7 @@ public class EchoMessage extends WebSock
return new EchoMessageHandler(byteBufSize,charBufSize);
}
- private static final class EchoMessageHandler extends MessageInbound {
+ private static final class EchoMessageHandler extends MessageHandler {
public EchoMessageHandler(int byteBufferMaxSize, int
charBufferMaxSize) {
super();
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java
Sat Nov 24 17:39:48 2012
@@ -34,10 +34,10 @@ public class EchoStream extends WebSocke
@Override
protected StreamHandler createWebSocketHandler(String subProtocol,
HttpServletRequest request) {
- return new EchoStreamInbound();
+ return new EchoStreamHandler();
}
- private static final class EchoStreamInbound extends StreamHandler {
+ private static final class EchoStreamHandler extends StreamHandler {
@Override
protected void onBinaryData(InputStream is) throws IOException {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java?rev=1413216&r1=1413215&r2=1413216&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java
Sat Nov 24 17:39:48 2012
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.Atomi
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import org.apache.catalina.websocket.MessageInbound;
+import org.apache.catalina.websocket.MessageHandler;
import org.apache.catalina.websocket.StreamHandler;
import org.apache.catalina.websocket.WebSocketServlet;
import org.apache.catalina.websocket.WsOutbound;
@@ -63,7 +63,7 @@ public class SnakeWebSocketServlet exten
private final AtomicInteger connectionIds = new AtomicInteger(0);
private final ConcurrentHashMap<Integer, Snake> snakes =
new ConcurrentHashMap<>();
- private final ConcurrentHashMap<Integer, SnakeMessageInbound> connections =
+ private final ConcurrentHashMap<Integer, SnakeMessageHandler> connections =
new ConcurrentHashMap<>();
@Override
@@ -97,7 +97,7 @@ public class SnakeWebSocketServlet exten
}
private void broadcast(String message) {
- for (SnakeMessageInbound connection : getConnections()) {
+ for (SnakeMessageHandler connection : getConnections()) {
try {
CharBuffer buffer = CharBuffer.wrap(message);
connection.getWsOutbound().writeTextMessage(buffer);
@@ -107,7 +107,7 @@ public class SnakeWebSocketServlet exten
}
}
- private Collection<SnakeMessageInbound> getConnections() {
+ private Collection<SnakeMessageHandler> getConnections() {
return Collections.unmodifiableCollection(connections.values());
}
@@ -151,15 +151,15 @@ public class SnakeWebSocketServlet exten
@Override
protected StreamHandler createWebSocketHandler(String subProtocol,
HttpServletRequest request) {
- return new SnakeMessageInbound(connectionIds.incrementAndGet());
+ return new SnakeMessageHandler(connectionIds.incrementAndGet());
}
- private final class SnakeMessageInbound extends MessageInbound {
+ private final class SnakeMessageHandler extends MessageHandler {
private final int id;
private Snake snake;
- private SnakeMessageInbound(int id) {
+ private SnakeMessageHandler(int id) {
this.id = id;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
