Author: markt
Date: Fri Aug 16 12:08:06 2013
New Revision: 1514670
URL: http://svn.apache.org/r1514670
Log:
Back-porting JSR-356
Switch to the AbstractServlet[In|Out]putStream implementations as they have the
new Servlet 3.1 methods required that aren't part of the Servlet 3.0 API
present in Tomcat 7.
For the same reason, point to the relocated ReadLister, WriterListener,
HttpUpgradeHandler and WebConnection interfaces.
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsFrameServer.java
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsFrameServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1514670&r1=1514669&r2=1514670&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsFrameServer.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsFrameServer.java
Fri Aug 16 12:08:06 2013
@@ -19,18 +19,17 @@ package org.apache.tomcat.websocket.serv
import java.io.EOFException;
import java.io.IOException;
-import javax.servlet.ServletInputStream;
-
+import org.apache.coyote.http11.upgrade.AbstractServletInputStream;
import org.apache.tomcat.websocket.WsFrameBase;
import org.apache.tomcat.websocket.WsSession;
public class WsFrameServer extends WsFrameBase {
- private final ServletInputStream sis;
+ private final AbstractServletInputStream sis;
private final Object connectionReadLock = new Object();
- public WsFrameServer(ServletInputStream sis, WsSession wsSession) {
+ public WsFrameServer(AbstractServletInputStream sis, WsSession wsSession) {
super(wsSession);
this.sis = sis;
}
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1514670&r1=1514669&r2=1514670&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Fri Aug 16 12:08:06 2013
@@ -20,19 +20,19 @@ import java.io.EOFException;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.WebConnection;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes;
import javax.websocket.DeploymentException;
import javax.websocket.Endpoint;
import javax.websocket.EndpointConfig;
+import org.apache.coyote.http11.upgrade.AbstractServletInputStream;
+import org.apache.coyote.http11.upgrade.AbstractServletOutputStream;
+import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler;
+import org.apache.coyote.http11.upgrade.servlet31.ReadListener;
+import org.apache.coyote.http11.upgrade.servlet31.WebConnection;
+import org.apache.coyote.http11.upgrade.servlet31.WriteListener;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -91,8 +91,8 @@ public class WsHttpUpgradeHandler implem
this.connection = connection;
- ServletInputStream sis;
- ServletOutputStream sos;
+ AbstractServletInputStream sis;
+ AbstractServletOutputStream sos;
try {
sis = connection.getInputStream();
sos = connection.getOutputStream();
Modified:
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1514670&r1=1514669&r2=1514670&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/websocket/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
Fri Aug 16 12:08:06 2013
@@ -25,6 +25,7 @@ import javax.servlet.ServletOutputStream
import javax.websocket.SendHandler;
import javax.websocket.SendResult;
+import org.apache.coyote.http11.upgrade.AbstractServletOutputStream;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -42,7 +43,7 @@ public class WsRemoteEndpointImplServer
private static final Log log =
LogFactory.getLog(WsHttpUpgradeHandler.class);
- private final ServletOutputStream sos;
+ private final AbstractServletOutputStream sos;
private final WsWriteTimeout wsWriteTimeout;
private volatile SendHandler handler = null;
private volatile ByteBuffer[] buffers = null;
@@ -51,7 +52,7 @@ public class WsRemoteEndpointImplServer
private volatile boolean close;
- public WsRemoteEndpointImplServer(ServletOutputStream sos,
+ public WsRemoteEndpointImplServer(AbstractServletOutputStream sos,
WsServerContainer serverContainer) {
this.sos = sos;
this.wsWriteTimeout = serverContainer.getTimeout();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
