Author: markt Date: Tue Aug 20 13:14:48 2013 New Revision: 1515817 URL: http://svn.apache.org/r1515817 Log: Deprecate the Tomcat 7 proprietary WebSocket API
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/Processor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue Aug 20 13:14:48 2013 @@ -76,7 +76,6 @@ import org.apache.catalina.realm.Generic import org.apache.catalina.util.ParameterMap; import org.apache.catalina.util.StringParser; import org.apache.coyote.ActionCode; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -2824,7 +2823,11 @@ public class Request // --------------------------------- Tomcat proprietary HTTP upgrade methods - public void doUpgrade(UpgradeInbound inbound) + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated + public void doUpgrade(org.apache.coyote.http11.upgrade.UpgradeInbound inbound) throws IOException { coyoteRequest.action(ActionCode.UPGRADE_TOMCAT, inbound); Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java Tue Aug 20 13:14:48 2013 @@ -18,7 +18,10 @@ package org.apache.catalina.websocket; /** * Constants for this Java package. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class Constants { public static final String Package = "org.apache.catalina.websocket"; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java Tue Aug 20 13:14:48 2013 @@ -29,7 +29,10 @@ import org.apache.tomcat.util.res.String * on messages. Applications should extend this class to provide application * specific functionality. Applications that wish to operate on a stream basis * rather than a message basis should use {@link StreamInbound}. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public abstract class MessageInbound extends StreamInbound { private static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java Tue Aug 20 13:14:48 2013 @@ -35,7 +35,10 @@ import org.apache.tomcat.util.net.Abstra * 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}. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public abstract class StreamInbound implements UpgradeInbound { private final ClassLoader applicationClassLoader; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Tue Aug 20 13:14:48 2013 @@ -42,7 +42,10 @@ import org.apache.tomcat.util.res.String * Provides the base implementation of a Servlet for processing WebSocket * connections as per RFC6455. It is expected that applications will extend this * implementation and provide application specific functionality. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public abstract class WebSocketServlet extends HttpServlet { private static final long serialVersionUID = 1L; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java Tue Aug 20 13:14:48 2013 @@ -30,7 +30,10 @@ import org.apache.tomcat.util.res.String /** * Represents a complete WebSocket frame with the exception of the payload for * non-control frames. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class WsFrame { private static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java Tue Aug 20 13:14:48 2013 @@ -44,7 +44,10 @@ import org.apache.tomcat.util.res.String /** * Wrapper for the HttpServletRequest object that allows the underlying request * object to be invalidated. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class WsHttpServletRequestWrapper implements HttpServletRequest { private static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java Tue Aug 20 13:14:48 2013 @@ -27,7 +27,10 @@ import org.apache.tomcat.util.res.String * makes the payload available for reading as an {@link InputStream}. It only * makes the number of bytes declared in the payload length available for * reading even if more bytes are available from the socket. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class WsInputStream extends InputStream { private static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java Tue Aug 20 13:14:48 2013 @@ -31,7 +31,10 @@ import org.apache.tomcat.util.res.String * that write to the client (or update a buffer that is later written to the * client) are synchronized to prevent multiple threads trying to write to the * client at the same time. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class WsOutbound { private static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Aug 20 13:14:48 2013 @@ -19,7 +19,6 @@ package org.apache.coyote; import java.io.IOException; import java.util.concurrent.Executor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.SocketStatus; @@ -150,6 +149,10 @@ public abstract class AbstractProcessor< @Override public abstract SocketState upgradeDispatch() throws IOException; + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override - public abstract UpgradeInbound getUpgradeInbound(); + public abstract org.apache.coyote.http11.upgrade.UpgradeInbound getUpgradeInbound(); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Tue Aug 20 13:14:48 2013 @@ -29,8 +29,6 @@ import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.apache.coyote.http11.upgrade.UpgradeInbound; -import org.apache.coyote.http11.upgrade.UpgradeProcessor; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.coyote.http11.upgrade.servlet31.WebConnection; import org.apache.juli.logging.Log; @@ -556,6 +554,7 @@ public abstract class AbstractProtocol i } + @SuppressWarnings("deprecation") // Old HTTP upgrade method has been deprecated public SocketState process(SocketWrapper<S> wrapper, SocketStatus status) { S socket = wrapper.getSocket(); @@ -626,7 +625,8 @@ public abstract class AbstractProtocol i httpUpgradeHandler.init((WebConnection) processor); } else if (state == SocketState.UPGRADING_TOMCAT) { // Get the UpgradeInbound handler - UpgradeInbound inbound = processor.getUpgradeInbound(); + org.apache.coyote.http11.upgrade.UpgradeInbound inbound = + processor.getUpgradeInbound(); // Release the Http11 processor to be re-used release(wrapper, processor, false, false); // Create the light-weight upgrade processor @@ -656,7 +656,7 @@ public abstract class AbstractProtocol i longPoll(wrapper, processor); } else { // Connection closed. OK to recycle the processor. - if (!(processor instanceof UpgradeProcessor)) { + if (!(processor instanceof org.apache.coyote.http11.upgrade.UpgradeProcessor)) { release(wrapper, processor, true, false); } } @@ -682,7 +682,7 @@ public abstract class AbstractProtocol i sm.getString("abstractConnectionHandler.error"), e); } // Don't try to add upgrade processors back into the pool - if (!(processor instanceof UpgradeProcessor)) { + if (!(processor instanceof org.apache.coyote.http11.upgrade.UpgradeProcessor)) { release(wrapper, processor, true, false); } return SocketState.CLOSED; @@ -696,9 +696,13 @@ public abstract class AbstractProtocol i protected abstract void release(SocketWrapper<S> socket, Processor<S> processor, boolean socketClosing, boolean addToPoller); + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated protected abstract Processor<S> createUpgradeProcessor( SocketWrapper<S> socket, - UpgradeInbound inbound) throws IOException; + org.apache.coyote.http11.upgrade.UpgradeInbound inbound) throws IOException; protected abstract Processor<S> createUpgradeProcessor( SocketWrapper<S> socket, HttpUpgradeHandler httpUpgradeProcessor) throws IOException; Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/Processor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/Processor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/Processor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/Processor.java Tue Aug 20 13:14:48 2013 @@ -20,7 +20,6 @@ package org.apache.coyote; import java.io.IOException; import java.util.concurrent.Executor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.SSLSupport; @@ -41,7 +40,15 @@ public interface Processor<S> { SocketState asyncDispatch(SocketStatus status); SocketState asyncPostProcess(); - UpgradeInbound getUpgradeInbound(); + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated + org.apache.coyote.http11.upgrade.UpgradeInbound getUpgradeInbound(); + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated SocketState upgradeDispatch() throws IOException; HttpUpgradeHandler getHttpUpgradeHandler(); Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Aug 20 13:14:48 2013 @@ -33,7 +33,6 @@ import org.apache.coyote.OutputBuffer; import org.apache.coyote.Request; import org.apache.coyote.RequestInfo; import org.apache.coyote.Response; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.tomcat.util.ExceptionUtils; @@ -534,8 +533,12 @@ public abstract class AbstractAjpProcess } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override - public UpgradeInbound getUpgradeInbound() { + public org.apache.coyote.http11.upgrade.UpgradeInbound getUpgradeInbound() { // Can't throw exception as this is used to test if connection has been // upgraded using Tomcat's proprietary HTTP upgrade mechanism. return null; Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Tue Aug 20 13:14:48 2013 @@ -18,7 +18,6 @@ package org.apache.coyote.ajp; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; @@ -91,9 +90,13 @@ public abstract class AbstractAjpProtoco socket.setAsync(true); } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override protected P createUpgradeProcessor(SocketWrapper<S> socket, - UpgradeInbound inbound) { + org.apache.coyote.http11.upgrade.UpgradeInbound inbound) { // TODO should fail - throw IOE return null; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue Aug 20 13:14:48 2013 @@ -36,7 +36,6 @@ import org.apache.coyote.http11.filters. import org.apache.coyote.http11.filters.SavedRequestInputFilter; import org.apache.coyote.http11.filters.VoidInputFilter; import org.apache.coyote.http11.filters.VoidOutputFilter; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.tomcat.util.ExceptionUtils; @@ -260,8 +259,11 @@ public abstract class AbstractHttp11Proc /** * Listener to which data available events are passed once the associated * connection has completed the proprietary Tomcat HTTP upgrade process. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ - protected UpgradeInbound upgradeInbound = null; + @Deprecated + protected org.apache.coyote.http11.upgrade.UpgradeInbound upgradeInbound = null; /** @@ -751,6 +753,7 @@ public abstract class AbstractHttp11Proc * @param param Action parameter */ @Override + @SuppressWarnings("deprecation") // Inbound/Outbound based upgrade mechanism public final void action(ActionCode actionCode, Object param) { if (actionCode == ActionCode.CLOSE) { @@ -853,7 +856,7 @@ public abstract class AbstractHttp11Proc } else if (actionCode == ActionCode.ASYNC_IS_ERROR) { ((AtomicBoolean) param).set(asyncStateMachine.isAsyncError()); } else if (actionCode == ActionCode.UPGRADE_TOMCAT) { - upgradeInbound = (UpgradeInbound) param; + upgradeInbound = (org.apache.coyote.http11.upgrade.UpgradeInbound) param; // Stop further HTTP output getOutputBuffer().finished = true; } else if (actionCode == ActionCode.UPGRADE) { @@ -1653,8 +1656,12 @@ public abstract class AbstractHttp11Proc } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override - public UpgradeInbound getUpgradeInbound() { + public org.apache.coyote.http11.upgrade.UpgradeInbound getUpgradeInbound() { return upgradeInbound; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Tue Aug 20 13:14:48 2013 @@ -21,8 +21,6 @@ import java.io.IOException; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; import org.apache.coyote.http11.upgrade.AprProcessor; -import org.apache.coyote.http11.upgrade.UpgradeAprProcessor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -262,6 +260,7 @@ public class Http11AprProtocol extends A // NOOP for APR } + @SuppressWarnings("deprecation") // Inbound/Outbound based upgrade @Override protected void longPoll(SocketWrapper<Long> socket, Processor<Long> processor) { @@ -316,11 +315,17 @@ public class Http11AprProtocol extends A return processor; } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override protected Processor<Long> createUpgradeProcessor( - SocketWrapper<Long> socket, UpgradeInbound inbound) + SocketWrapper<Long> socket, + org.apache.coyote.http11.upgrade.UpgradeInbound inbound) throws IOException { - return new UpgradeAprProcessor(socket, inbound); + return new org.apache.coyote.http11.upgrade.UpgradeAprProcessor( + socket, inbound); } @Override Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Aug 20 13:14:48 2013 @@ -23,8 +23,6 @@ import java.util.Iterator; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; import org.apache.coyote.http11.upgrade.NioProcessor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; -import org.apache.coyote.http11.upgrade.UpgradeNioProcessor; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -281,11 +279,17 @@ public class Http11NioProtocol extends A return processor; } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override protected Processor<NioChannel> createUpgradeProcessor( - SocketWrapper<NioChannel> socket, UpgradeInbound inbound) + SocketWrapper<NioChannel> socket, + org.apache.coyote.http11.upgrade.UpgradeInbound inbound) throws IOException { - return new UpgradeNioProcessor(socket, inbound, + return new org.apache.coyote.http11.upgrade.UpgradeNioProcessor( + socket, inbound, ((Http11NioProtocol) getProtocol()).getEndpoint().getSelectorPool()); } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java Tue Aug 20 13:14:48 2013 @@ -22,8 +22,6 @@ import java.net.Socket; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; import org.apache.coyote.http11.upgrade.BioProcessor; -import org.apache.coyote.http11.upgrade.UpgradeBioProcessor; -import org.apache.coyote.http11.upgrade.UpgradeInbound; import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler; import org.apache.juli.logging.Log; import org.apache.tomcat.util.net.AbstractEndpoint; @@ -187,11 +185,17 @@ public class Http11Protocol extends Abst return processor; } + /** + * @deprecated Will be removed in Tomcat 8.0.x. + */ + @Deprecated @Override protected Processor<Socket> createUpgradeProcessor( - SocketWrapper<Socket> socket, UpgradeInbound inbound) + SocketWrapper<Socket> socket, + org.apache.coyote.http11.upgrade.UpgradeInbound inbound) throws IOException { - return new UpgradeBioProcessor(socket, inbound); + return new org.apache.coyote.http11.upgrade.UpgradeBioProcessor( + socket, inbound); } @Override Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java Tue Aug 20 13:14:48 2013 @@ -126,6 +126,7 @@ public abstract class AbstractProcessor< // ------------------ Processor methods for Inbound/Outbound based mechanism @Override + @Deprecated public UpgradeInbound getUpgradeInbound() { return null; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java Tue Aug 20 13:14:48 2013 @@ -22,6 +22,10 @@ import org.apache.tomcat.jni.Socket; import org.apache.tomcat.jni.Status; import org.apache.tomcat.util.net.SocketWrapper; +/** + * @deprecated Will be removed in Tomcat 8.0.x. + */ +@Deprecated public class UpgradeAprProcessor extends UpgradeProcessor<Long> { private final long socket; Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java Tue Aug 20 13:14:48 2013 @@ -23,6 +23,10 @@ import java.net.Socket; import org.apache.tomcat.util.net.SocketWrapper; +/** + * @deprecated Will be removed in Tomcat 8.0.x. + */ +@Deprecated public class UpgradeBioProcessor extends UpgradeProcessor<Socket> { private final InputStream inputStream; Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeInbound.java Tue Aug 20 13:14:48 2013 @@ -23,7 +23,10 @@ import org.apache.tomcat.util.net.Abstra /** * Receives notification that there is data to be read on the upgraded * connection and processes it. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public interface UpgradeInbound { void setUpgradeProcessor(UpgradeProcessor<?> processor); Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java Tue Aug 20 13:14:48 2013 @@ -26,6 +26,10 @@ import org.apache.tomcat.util.net.NioEnd import org.apache.tomcat.util.net.NioSelectorPool; import org.apache.tomcat.util.net.SocketWrapper; +/** + * @deprecated Will be removed in Tomcat 8.0.x. + */ +@Deprecated public class UpgradeNioProcessor extends UpgradeProcessor<NioChannel> { private final NioChannel nioChannel; Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java Tue Aug 20 13:14:48 2013 @@ -22,7 +22,10 @@ import java.io.OutputStream; /** * Allows data to be written to the upgraded connection. + * + * @deprecated Will be removed in Tomcat 8.0.x. */ +@Deprecated public class UpgradeOutbound extends OutputStream { @Override Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java Tue Aug 20 13:14:48 2013 @@ -28,6 +28,10 @@ import org.apache.tomcat.util.net.Socket import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; +/** + * @deprecated Will be removed in Tomcat 8.0.x. + */ +@Deprecated public abstract class UpgradeProcessor<S> implements Processor<S> { protected static final StringManager sm = Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java?rev=1515817&r1=1515816&r2=1515817&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/websocket/TestWebSocket.java Tue Aug 20 13:14:48 2013 @@ -56,6 +56,10 @@ import org.apache.tomcat.util.buf.C2BCon import org.apache.tomcat.util.buf.CharChunk; import org.apache.tomcat.websocket.TesterEchoServer; +/** + * @deprecated Will be removed in Tomcat 8.0.x. + */ +@Deprecated public class TestWebSocket extends TomcatBaseTest { private static final String CRLF = "\r\n"; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org