Author: markt Date: Mon Feb 11 20:24:03 2013 New Revision: 1444946 URL: http://svn.apache.org/r1444946 Log: Rename ProtocolHandler to HttpUpgradeHandler
Added: tomcat/trunk/java/javax/servlet/http/HttpUpgradeHandler.java - copied, changed from r1444731, tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java Removed: tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java tomcat/trunk/java/javax/servlet/http/WebConnection.java tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java tomcat/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java tomcat/trunk/java/org/apache/coyote/Processor.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original) +++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Mon Feb 11 20:24:03 2013 @@ -501,5 +501,5 @@ public interface HttpServletRequest exte * * @since Servlet 3.1 */ - public void upgrade(ProtocolHandler handler) throws java.io.IOException; + public void upgrade(HttpUpgradeHandler handler) throws java.io.IOException; } Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java (original) +++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Mon Feb 11 20:24:03 2013 @@ -355,13 +355,13 @@ public class HttpServletRequestWrapper e * {@inheritDoc} * <p> * The default behavior of this method is to return - * {@link HttpServletRequest#upgrade(ProtocolHandler)} + * {@link HttpServletRequest#upgrade(HttpUpgradeHandler)} * on the wrapped request object. * * @since Servlet 3.1 */ @Override - public void upgrade(ProtocolHandler handler) throws java.io.IOException { + public void upgrade(HttpUpgradeHandler handler) throws java.io.IOException { this._getHttpServletRequest().upgrade(handler); } } Copied: tomcat/trunk/java/javax/servlet/http/HttpUpgradeHandler.java (from r1444731, tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpUpgradeHandler.java?p2=tomcat/trunk/java/javax/servlet/http/HttpUpgradeHandler.java&p1=tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java&r1=1444731&r2=1444946&rev=1444946&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java (original) +++ tomcat/trunk/java/javax/servlet/http/HttpUpgradeHandler.java Mon Feb 11 20:24:03 2013 @@ -21,13 +21,13 @@ package javax.servlet.http; * * @since Servlet 3.1 */ -public interface ProtocolHandler { +public interface HttpUpgradeHandler { /** * This method is called once the request/response pair where - * {@link HttpServletRequest#upgrade(ProtocolHandler)} is called has + * {@link HttpServletRequest#upgrade(HttpUpgradeHandler)} is called has * completed processing and is the point where control of the connection - * passes from the container to the {@link ProtocolHandler}. + * passes from the container to the {@link HttpUpgradeHandler}. * * @param connection The connection that has been upgraded * Modified: tomcat/trunk/java/javax/servlet/http/WebConnection.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/WebConnection.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/http/WebConnection.java (original) +++ tomcat/trunk/java/javax/servlet/http/WebConnection.java Mon Feb 11 20:24:03 2013 @@ -22,7 +22,7 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; /** - * The interface used by a {@link ProtocolHandler} to interact with an upgraded + * The interface used by a {@link HttpUpgradeHandler} to interact with an upgraded * HTTP connection. * * @since Servlet 3.1 Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Feb 11 20:24:03 2013 @@ -58,8 +58,8 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; -import javax.servlet.http.ProtocolHandler; import org.apache.catalina.Context; import org.apache.catalina.Globals; @@ -1884,7 +1884,7 @@ public class Request * @since Servlet 3.1 */ @Override - public void upgrade(ProtocolHandler handler) throws IOException { + public void upgrade(HttpUpgradeHandler handler) throws IOException { coyoteRequest.action(ActionCode.UPGRADE, handler); // Output required by RFC2616. Protocol specific headers should have Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Mon Feb 11 20:24:03 2013 @@ -37,8 +37,8 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; -import javax.servlet.http.ProtocolHandler; import org.apache.catalina.Globals; import org.apache.catalina.security.SecurityUtil; @@ -1102,7 +1102,7 @@ public class RequestFacade implements Ht * @since Servlet 3.1 */ @Override - public void upgrade(ProtocolHandler handler) throws IOException { + public void upgrade(HttpUpgradeHandler handler) throws IOException { request.upgrade(handler); } } 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=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/StreamHandler.java Mon Feb 11 20:24:03 2013 @@ -24,7 +24,7 @@ import java.nio.ByteBuffer; import java.nio.charset.MalformedInputException; import java.nio.charset.UnmappableCharacterException; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; @@ -35,7 +35,7 @@ import org.apache.tomcat.util.net.Abstra * specific functionality. Applications that wish to operate on a message basis * rather than a stream basis should use {@link MessageHandler}. */ -public abstract class StreamHandler implements ProtocolHandler { +public abstract class StreamHandler implements HttpUpgradeHandler { private final ClassLoader applicationClassLoader; private WsOutbound outbound; Modified: tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java Mon Feb 11 20:24:03 2013 @@ -30,7 +30,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.catalina.util.Base64; import org.apache.tomcat.util.buf.B2CConverter; @@ -113,7 +113,7 @@ public abstract class WebSocketServlet e } WsHttpServletRequestWrapper wrapper = new WsHttpServletRequestWrapper(req); - ProtocolHandler wsHandler = + HttpUpgradeHandler wsHandler = createWebSocketHandler(subProtocol, wrapper); wrapper.invalidate(); @@ -228,6 +228,6 @@ public abstract class WebSocketServlet e * method. If Tomcat detects such access, it will throw * an IllegalStateException */ - protected abstract ProtocolHandler createWebSocketHandler( + protected abstract HttpUpgradeHandler createWebSocketHandler( String subProtocol, HttpServletRequest request); } Modified: tomcat/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java Mon Feb 11 20:24:03 2013 @@ -37,8 +37,8 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.Part; -import javax.servlet.http.ProtocolHandler; import org.apache.tomcat.util.res.StringManager; @@ -409,7 +409,7 @@ public class WsHttpServletRequestWrapper } @Override - public void upgrade(ProtocolHandler handler) throws IOException { + public void upgrade(HttpUpgradeHandler handler) throws IOException { getRequest().upgrade(handler); } } Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Feb 11 20:24:03 2013 @@ -154,5 +154,5 @@ public abstract class AbstractProcessor< throws IOException; @Override - public abstract javax.servlet.http.ProtocolHandler getHttpUpgradeHandler(); + public abstract javax.servlet.http.HttpUpgradeHandler getHttpUpgradeHandler(); } Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Feb 11 20:24:03 2013 @@ -626,7 +626,7 @@ public abstract class AbstractProtocol i if (state == SocketState.UPGRADING) { // Get the HTTP upgrade handler - javax.servlet.http.ProtocolHandler httpUpgradeHandler = + javax.servlet.http.HttpUpgradeHandler httpUpgradeHandler = processor.getHttpUpgradeHandler(); // Release the Http11 processor to be re-used release(wrapper, processor, false, false); @@ -720,7 +720,7 @@ public abstract class AbstractProtocol i boolean addToPoller); protected abstract Processor<S> createUpgradeProcessor( SocketWrapper<S> socket, - javax.servlet.http.ProtocolHandler httpUpgradeProcessor) + javax.servlet.http.HttpUpgradeHandler httpUpgradeProcessor) throws IOException; protected void register(AbstractProcessor<S> processor) { Modified: tomcat/trunk/java/org/apache/coyote/Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/Processor.java Mon Feb 11 20:24:03 2013 @@ -38,7 +38,7 @@ public interface Processor<S> { SocketState asyncDispatch(SocketStatus status); SocketState asyncPostProcess(); - javax.servlet.http.ProtocolHandler getHttpUpgradeHandler(); + javax.servlet.http.HttpUpgradeHandler getHttpUpgradeHandler(); SocketState upgradeDispatch(SocketStatus status) throws IOException; boolean isComet(); Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Mon Feb 11 20:24:03 2013 @@ -25,7 +25,7 @@ import java.security.cert.CertificateFac import java.security.cert.X509Certificate; import java.util.concurrent.atomic.AtomicBoolean; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProcessor; import org.apache.coyote.ActionCode; @@ -537,7 +537,7 @@ public abstract class AbstractAjpProcess @Override - public ProtocolHandler getHttpUpgradeHandler() { + public HttpUpgradeHandler getHttpUpgradeHandler() { // Should never reach this code but in case we do... throw new IllegalStateException( sm.getString("ajpprocessor.httpupgrade.notsupported")); Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Mon Feb 11 20:24:03 2013 @@ -16,7 +16,7 @@ */ package org.apache.coyote.ajp; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; @@ -92,7 +92,7 @@ public abstract class AbstractAjpProtoco @Override protected P createUpgradeProcessor(SocketWrapper<S> socket, - ProtocolHandler httpUpgradeHandler) { + HttpUpgradeHandler httpUpgradeHandler) { // TODO should fail - throw IOE return null; } Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon Feb 11 20:24:03 2013 @@ -23,7 +23,7 @@ import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Pattern; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProcessor; import org.apache.coyote.ActionCode; @@ -223,7 +223,7 @@ public abstract class AbstractHttp11Proc * Instance of the new protocol to use after the HTTP connection has been * upgraded. */ - protected ProtocolHandler httpUpgradeHandler = null; + protected HttpUpgradeHandler httpUpgradeHandler = null; public AbstractHttp11Processor(AbstractEndpoint endpoint) { @@ -804,7 +804,7 @@ public abstract class AbstractHttp11Proc } else if (actionCode == ActionCode.ASYNC_IS_ERROR) { ((AtomicBoolean) param).set(asyncStateMachine.isAsyncError()); } else if (actionCode == ActionCode.UPGRADE) { - httpUpgradeHandler = (ProtocolHandler) param; + httpUpgradeHandler = (HttpUpgradeHandler) param; // Stop further HTTP output getOutputBuffer().finished = true; } else { @@ -1558,7 +1558,7 @@ public abstract class AbstractHttp11Proc @Override - public ProtocolHandler getHttpUpgradeHandler() { + public HttpUpgradeHandler getHttpUpgradeHandler() { return httpUpgradeHandler; } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Feb 11 20:24:03 2013 @@ -18,7 +18,7 @@ package org.apache.coyote.http11; import java.io.IOException; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; @@ -341,7 +341,7 @@ public class Http11AprProtocol extends A @Override protected Processor<Long> createUpgradeProcessor( SocketWrapper<Long> socket, - ProtocolHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeProcessor) throws IOException { return new AprProcessor(socket, httpUpgradeProcessor, (AprEndpoint) proto.endpoint); Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Feb 11 20:24:03 2013 @@ -21,7 +21,7 @@ import java.nio.channels.SocketChannel; import java.util.Iterator; import javax.net.ssl.SSLEngine; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; @@ -303,7 +303,7 @@ public class Http11NioProtocol extends A @Override protected Processor<NioChannel> createUpgradeProcessor( SocketWrapper<NioChannel> socket, - ProtocolHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeProcessor) throws IOException { return new NioProcessor(socket, httpUpgradeProcessor, ((Http11NioProtocol) getProtocol()).getEndpoint().getSelectorPool()); Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Mon Feb 11 20:24:03 2013 @@ -19,7 +19,7 @@ package org.apache.coyote.http11; import java.io.IOException; import java.net.Socket; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProtocol; import org.apache.coyote.Processor; @@ -210,7 +210,7 @@ public class Http11Protocol extends Abst @Override protected Processor<Socket> createUpgradeProcessor( SocketWrapper<Socket> socket, - ProtocolHandler httpUpgradeProcessor) + HttpUpgradeHandler httpUpgradeProcessor) throws IOException { return new BioProcessor(socket, httpUpgradeProcessor); } Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java Mon Feb 11 20:24:03 2013 @@ -21,7 +21,7 @@ import java.util.concurrent.Executor; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; import org.apache.coyote.Processor; @@ -38,11 +38,11 @@ public abstract class AbstractProcessor< protected static final StringManager sm = StringManager.getManager(Constants.Package); - private final ProtocolHandler httpUpgradeHandler; + private final HttpUpgradeHandler httpUpgradeHandler; private final AbstractServletInputStream upgradeServletInputStream; private final AbstractServletOutputStream upgradeServletOutputStream; - protected AbstractProcessor (ProtocolHandler httpUpgradeHandler, + protected AbstractProcessor (HttpUpgradeHandler httpUpgradeHandler, AbstractServletInputStream upgradeServletInputStream, AbstractServletOutputStream upgradeServletOutputStream) { this.httpUpgradeHandler = httpUpgradeHandler; @@ -73,7 +73,7 @@ public abstract class AbstractProcessor< } @Override - public ProtocolHandler getHttpUpgradeHandler() { + public HttpUpgradeHandler getHttpUpgradeHandler() { return httpUpgradeHandler; } Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java Mon Feb 11 20:24:03 2013 @@ -16,7 +16,7 @@ */ package org.apache.coyote.http11.upgrade; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.tomcat.jni.Socket; import org.apache.tomcat.util.net.AprEndpoint; @@ -27,7 +27,7 @@ public class AprProcessor extends Abstra private static final int INFINITE_TIMEOUT = -1; public AprProcessor(SocketWrapper<Long> wrapper, - ProtocolHandler httpUpgradeProcessor, AprEndpoint endpoint) { + HttpUpgradeHandler httpUpgradeProcessor, AprEndpoint endpoint) { super(httpUpgradeProcessor, new AprServletInputStream(wrapper), new AprServletOutputStream(wrapper, endpoint)); Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java Mon Feb 11 20:24:03 2013 @@ -19,7 +19,7 @@ package org.apache.coyote.http11.upgrade import java.io.IOException; import java.net.Socket; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.tomcat.util.net.SocketWrapper; @@ -28,7 +28,7 @@ public class BioProcessor extends Abstra private static final int INFINITE_TIMEOUT = 0; public BioProcessor(SocketWrapper<Socket> wrapper, - ProtocolHandler httpUpgradeProcessor) throws IOException { + HttpUpgradeHandler httpUpgradeProcessor) throws IOException { super(httpUpgradeProcessor, new BioServletInputStream(wrapper), new BioServletOutputStream(wrapper)); Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java Mon Feb 11 20:24:03 2013 @@ -16,7 +16,7 @@ */ package org.apache.coyote.http11.upgrade; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioSelectorPool; @@ -27,7 +27,7 @@ public class NioProcessor extends Abstra private static final int INFINITE_TIMEOUT = -1; public NioProcessor(SocketWrapper<NioChannel> wrapper, - ProtocolHandler httpUpgradeProcessor, NioSelectorPool pool) { + HttpUpgradeHandler httpUpgradeProcessor, NioSelectorPool pool) { super(httpUpgradeProcessor, new NioServletInputStream(wrapper, pool), new NioServletOutputStream(wrapper, pool)); Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Mon Feb 11 20:24:03 2013 @@ -22,7 +22,7 @@ import java.net.InetAddress; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import org.apache.coyote.AbstractProcessor; import org.apache.coyote.ActionCode; @@ -570,7 +570,7 @@ public class SpdyProcessor extends Abstr } @Override - public ProtocolHandler getHttpUpgradeHandler() { + public HttpUpgradeHandler getHttpUpgradeHandler() { return null; } } 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=1444946&r1=1444945&r2=1444946&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 11 20:24:03 2013 @@ -23,7 +23,7 @@ import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.WriteListener; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; import javax.websocket.CloseReason; import javax.websocket.CloseReason.CloseCodes; @@ -39,7 +39,7 @@ import org.apache.tomcat.websocket.WsSes /** * Servlet 3.1 HTTP upgrade handler for WebSocket connections. */ -public class WsProtocolHandler implements ProtocolHandler { +public class WsProtocolHandler implements HttpUpgradeHandler { private static StringManager sm = StringManager.getManager(Constants.PACKAGE_NAME); Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServlet.java Mon Feb 11 20:24:03 2013 @@ -32,7 +32,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import javax.websocket.Endpoint; import javax.websocket.Extension; import javax.websocket.server.ServerEndpointConfiguration; @@ -128,7 +128,7 @@ public class WsServlet extends HttpServl } catch (InstantiationException | IllegalAccessException e) { throw new ServletException(e); } - ProtocolHandler wsHandler = new WsProtocolHandler(ep, sec, sc); + HttpUpgradeHandler wsHandler = new WsProtocolHandler(ep, sec, sc); req.upgrade(wsHandler); } Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1444946&r1=1444945&r2=1444946&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java (original) +++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Mon Feb 11 20:24:03 2013 @@ -35,7 +35,7 @@ import javax.servlet.WriteListener; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.ProtocolHandler; +import javax.servlet.http.HttpUpgradeHandler; import javax.servlet.http.WebConnection; import org.junit.Assert; @@ -73,7 +73,7 @@ public class TestUpgrade extends TomcatB } private void doTestMessages ( - Class<? extends ProtocolHandler> upgradeHandlerClass) + Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws Exception { UpgradeConnection conn = doUpgrade(upgradeHandlerClass); PrintWriter pw = new PrintWriter(conn.getWriter()); @@ -97,7 +97,7 @@ public class TestUpgrade extends TomcatB private UpgradeConnection doUpgrade( - Class<? extends ProtocolHandler> upgradeHandlerClass) throws Exception { + Class<? extends HttpUpgradeHandler> upgradeHandlerClass) throws Exception { // Setup Tomcat instance Tomcat tomcat = getTomcatInstance(); @@ -149,9 +149,9 @@ public class TestUpgrade extends TomcatB private static final long serialVersionUID = 1L; - private final Class<? extends ProtocolHandler> upgradeHandlerClass; + private final Class<? extends HttpUpgradeHandler> upgradeHandlerClass; - public UpgradeServlet(Class<? extends ProtocolHandler> upgradeHandlerClass) { + public UpgradeServlet(Class<? extends HttpUpgradeHandler> upgradeHandlerClass) { this.upgradeHandlerClass = upgradeHandlerClass; } @@ -159,7 +159,7 @@ public class TestUpgrade extends TomcatB protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - ProtocolHandler upgradeHandler; + HttpUpgradeHandler upgradeHandler; try { upgradeHandler = upgradeHandlerClass.newInstance(); } catch (InstantiationException | IllegalAccessException e) { @@ -189,7 +189,7 @@ public class TestUpgrade extends TomcatB } - protected static class EchoBlocking implements ProtocolHandler { + protected static class EchoBlocking implements HttpUpgradeHandler { @Override public void init(WebConnection connection) { @@ -204,7 +204,7 @@ public class TestUpgrade extends TomcatB } - protected static class EchoNonBlocking implements ProtocolHandler { + protected static class EchoNonBlocking implements HttpUpgradeHandler { private ServletInputStream sis; private ServletOutputStream sos; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org