Author: markt
Date: Mon Feb 25 12:24:10 2013
New Revision: 1449680
URL: http://svn.apache.org/r1449680
Log:
Rename prior to some refactoring
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
Mon Feb 25 12:24:10 2013
@@ -26,10 +26,10 @@ import javax.websocket.SendHandler;
// TODO Use a common base class
public class WsRemoteEndpointAsync implements RemoteEndpoint.Async {
- private final WsRemoteEndpointBase base;
+ private final WsRemoteEndpointImplBase base;
- WsRemoteEndpointAsync(WsRemoteEndpointBase base) {
+ WsRemoteEndpointAsync(WsRemoteEndpointImplBase base) {
this.base = base;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
Mon Feb 25 12:24:10 2013
@@ -27,10 +27,10 @@ import javax.websocket.RemoteEndpoint;
//TODO Use a common base class
public class WsRemoteEndpointBasic implements RemoteEndpoint.Basic {
- private final WsRemoteEndpointBase base;
+ private final WsRemoteEndpointImplBase base;
- WsRemoteEndpointBasic(WsRemoteEndpointBase base) {
+ WsRemoteEndpointBasic(WsRemoteEndpointImplBase base) {
this.base = base;
}
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java&r1=1449658&r2=1449680&rev=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Mon Feb 25 12:24:10 2013
@@ -45,12 +45,12 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-public abstract class WsRemoteEndpointBase implements RemoteEndpoint {
+public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint {
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private final Log log = LogFactory.getLog(WsRemoteEndpointBase.class);
+ private final Log log = LogFactory.getLog(WsRemoteEndpointImplBase.class);
private boolean messagePartInProgress = false;
private final Queue<MessagePart> messagePartQueue = new ArrayDeque<>();
@@ -348,7 +348,7 @@ public abstract class WsRemoteEndpointBa
private final SendHandler handler;
public MessagePart(byte opCode, ByteBuffer payload, boolean last,
- SendHandler handler, WsRemoteEndpointBase endpoint) {
+ SendHandler handler, WsRemoteEndpointImplBase endpoint) {
this.opCode = opCode;
this.payload = payload;
this.last = last;
@@ -384,11 +384,11 @@ public abstract class WsRemoteEndpointBa
*/
private static class EndMessageHandler implements SendHandler {
- private final WsRemoteEndpointBase endpoint;
+ private final WsRemoteEndpointImplBase endpoint;
private final SendHandler handler;
private final boolean dataMessage;
- public EndMessageHandler(WsRemoteEndpointBase endpoint,
+ public EndMessageHandler(WsRemoteEndpointImplBase endpoint,
SendHandler handler, boolean dataMessage) {
this.endpoint = endpoint;
this.handler = handler;
@@ -538,12 +538,12 @@ public abstract class WsRemoteEndpointBa
private final boolean isLast;
private final CharsetEncoder encoder;
private final ByteBuffer buffer;
- private final WsRemoteEndpointBase endpoint;
+ private final WsRemoteEndpointImplBase endpoint;
private volatile boolean isDone = false;
public TextMessageSendHandler(SendHandler handler, CharBuffer message,
boolean isLast, CharsetEncoder encoder,
- ByteBuffer encoderBuffer, WsRemoteEndpointBase endpoint) {
+ ByteBuffer encoderBuffer, WsRemoteEndpointImplBase endpoint) {
this.handler = handler;
this.message = message;
this.isLast = isLast;
@@ -587,13 +587,13 @@ public abstract class WsRemoteEndpointBa
private final byte[] mask;
private final ByteBuffer outputBuffer;
private volatile boolean flushRequired;
- private final WsRemoteEndpointBase endpoint;
+ private final WsRemoteEndpointImplBase endpoint;
private int maskIndex = 0;
public OutputBufferSendHandler(SendHandler completion,
ByteBuffer headerBuffer, ByteBuffer payload, byte[] mask,
ByteBuffer outputBuffer, boolean flushRequired,
- WsRemoteEndpointBase endpoint) {
+ WsRemoteEndpointImplBase endpoint) {
this.handler = completion;
this.headerBuffer = headerBuffer;
this.payload = payload;
@@ -719,10 +719,10 @@ public abstract class WsRemoteEndpointBa
private static class WsOutputStream extends OutputStream {
- private final WsRemoteEndpointBase endpoint;
+ private final WsRemoteEndpointImplBase endpoint;
private final ByteBuffer buffer = ByteBuffer.allocate(8192);
- public WsOutputStream(WsRemoteEndpointBase endpoint) {
+ public WsOutputStream(WsRemoteEndpointImplBase endpoint) {
this.endpoint = endpoint;
}
@@ -767,10 +767,10 @@ public abstract class WsRemoteEndpointBa
private static class WsWriter extends Writer {
- private final WsRemoteEndpointBase endpoint;
+ private final WsRemoteEndpointImplBase endpoint;
private final CharBuffer buffer = CharBuffer.allocate(8192);
- public WsWriter(WsRemoteEndpointBase endpoint) {
+ public WsWriter(WsRemoteEndpointImplBase endpoint) {
this.endpoint = endpoint;
}
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
(from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java&r1=1449658&r2=1449680&rev=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
Mon Feb 25 12:24:10 2013
@@ -25,11 +25,11 @@ import java.util.concurrent.TimeUnit;
import javax.websocket.SendHandler;
import javax.websocket.SendResult;
-public class WsRemoteEndpointClient extends WsRemoteEndpointBase {
+public class WsRemoteEndpointImplClient extends WsRemoteEndpointImplBase {
private final AsynchronousSocketChannel channel;
- public WsRemoteEndpointClient(AsynchronousSocketChannel channel) {
+ public WsRemoteEndpointImplClient(AsynchronousSocketChannel channel) {
this.channel = channel;
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Feb 25
12:24:10 2013
@@ -53,7 +53,7 @@ public class WsSession implements Sessio
private final Log log = LogFactory.getLog(WsSession.class);
private final Endpoint localEndpoint;
- private final WsRemoteEndpointBase wsRemoteEndpoint;
+ private final WsRemoteEndpointImplBase wsRemoteEndpoint;
private final RemoteEndpoint.Async remoteEndpointAsync;
private final RemoteEndpoint.Basic remoteEndpointBasic;
private final ClassLoader applicationClassLoader;
@@ -87,7 +87,7 @@ public class WsSession implements Sessio
* @param wsRemoteEndpoint
*/
public WsSession(Endpoint localEndpoint,
- WsRemoteEndpointBase wsRemoteEndpoint,
+ WsRemoteEndpointImplBase wsRemoteEndpoint,
WsWebSocketContainer wsWebSocketContainer,
WsRequest request, String subProtocol,
Map<String,String> pathParameters,
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon
Feb 25 12:24:10 2013
@@ -160,8 +160,8 @@ public class WsWebSocketContainer
}
// Switch to WebSocket
- WsRemoteEndpointClient wsRemoteEndpointClient =
- new WsRemoteEndpointClient(channel);
+ WsRemoteEndpointImplClient wsRemoteEndpointClient =
+ new WsRemoteEndpointImplClient(channel);
Endpoint endpoint;
try {
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
Mon Feb 25 12:24:10 2013
@@ -92,8 +92,8 @@ public class WsProtocolHandler implement
ClassLoader cl = t.getContextClassLoader();
t.setContextClassLoader(applicationClassLoader);
try {
- WsRemoteEndpointServer wsRemoteEndpointServer =
- new WsRemoteEndpointServer(sos, webSocketContainer);
+ WsRemoteEndpointImplServer wsRemoteEndpointServer =
+ new WsRemoteEndpointImplServer(sos, webSocketContainer);
wsSession = new WsSession(ep, wsRemoteEndpointServer,
webSocketContainer, request, subProtocol, pathParameters,
secure, endpointConfig.getEncoders());
@@ -181,10 +181,10 @@ public class WsProtocolHandler implement
private static class WsWriteListener implements WriteListener {
private final WsProtocolHandler wsProtocolHandler;
- private final WsRemoteEndpointServer wsRemoteEndpointServer;
+ private final WsRemoteEndpointImplServer wsRemoteEndpointServer;
private WsWriteListener(WsProtocolHandler wsProtocolHandler,
- WsRemoteEndpointServer wsRemoteEndpointServer) {
+ WsRemoteEndpointImplServer wsRemoteEndpointServer) {
this.wsProtocolHandler = wsProtocolHandler;
this.wsRemoteEndpointServer = wsRemoteEndpointServer;
}
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java&r1=1449658&r2=1449680&rev=1449680&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Mon Feb 25 12:24:10 2013
@@ -27,14 +27,14 @@ import javax.websocket.SendResult;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-import org.apache.tomcat.websocket.WsRemoteEndpointBase;
+import org.apache.tomcat.websocket.WsRemoteEndpointImplBase;
/**
* This is the server side {@link javax.websocket.RemoteEndpoint}
implementation
* - i.e. what the server uses to send data to the client. Communication is
over
* a {@link ServletOutputStream}.
*/
-public class WsRemoteEndpointServer extends WsRemoteEndpointBase {
+public class WsRemoteEndpointImplServer extends WsRemoteEndpointImplBase {
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
@@ -50,7 +50,7 @@ public class WsRemoteEndpointServer exte
private volatile boolean close;
- public WsRemoteEndpointServer(ServletOutputStream sos,
+ public WsRemoteEndpointImplServer(ServletOutputStream sos,
ServerContainerImpl serverContainer) {
this.sos = sos;
this.wsWriteTimeout = serverContainer.getTimeout();
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
Mon Feb 25 12:24:10 2013
@@ -33,7 +33,7 @@ import org.apache.tomcat.websocket.Backg
*/
public class WsWriteTimeout implements BackgroundProcess {
- private final Set<WsRemoteEndpointServer> endpoints =
+ private final Set<WsRemoteEndpointImplServer> endpoints =
new ConcurrentSkipListSet<>(new EndpointComparator());
private final AtomicInteger count = new AtomicInteger(0);
private int backgroundProcessCount = 0;
@@ -48,9 +48,9 @@ public class WsWriteTimeout implements B
backgroundProcessCount = 0;
long now = System.currentTimeMillis();
- Iterator<WsRemoteEndpointServer> iter = endpoints.iterator();
+ Iterator<WsRemoteEndpointImplServer> iter = endpoints.iterator();
while (iter.hasNext()) {
- WsRemoteEndpointServer endpoint = iter.next();
+ WsRemoteEndpointImplServer endpoint = iter.next();
if (endpoint.getTimeoutExpiry() < now) {
endpoint.onTimeout();
} else {
@@ -82,7 +82,7 @@ public class WsWriteTimeout implements B
}
- public void register(WsRemoteEndpointServer endpoint) {
+ public void register(WsRemoteEndpointImplServer endpoint) {
boolean result = endpoints.add(endpoint);
if (result) {
int newCount = count.incrementAndGet();
@@ -93,7 +93,7 @@ public class WsWriteTimeout implements B
}
- public void unregister(WsRemoteEndpointServer endpoint) {
+ public void unregister(WsRemoteEndpointImplServer endpoint) {
boolean result = endpoints.remove(endpoint);
if (result) {
int newCount = count.decrementAndGet();
@@ -108,11 +108,11 @@ public class WsWriteTimeout implements B
* Note: this comparator imposes orderings that are inconsistent with
equals
*/
private static class EndpointComparator implements
- Comparator<WsRemoteEndpointServer> {
+ Comparator<WsRemoteEndpointImplServer> {
@Override
- public int compare(WsRemoteEndpointServer o1,
- WsRemoteEndpointServer o2) {
+ public int compare(WsRemoteEndpointImplServer o1,
+ WsRemoteEndpointImplServer o2) {
long t1 = o1.getTimeoutExpiry();
long t2 = o2.getTimeoutExpiry();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
