Moving ExtensionConfig into .protocol. package
This commit is contained in:
Joakim Erdfelt
parent
cd46dc3cee
commit
3b2aa4c45e
|
|
@ -15,6 +15,8 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.jetty.websocket.extensions;
|
||||
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
|
||||
public class AbstractExtension implements Extension
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
*******************************************************************************/
|
||||
package org.eclipse.jetty.websocket.extensions;
|
||||
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
|
||||
public interface Extension
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import java.util.zip.Inflater;
|
|||
import org.eclipse.jetty.util.log.Log;
|
||||
import org.eclipse.jetty.util.log.Logger;
|
||||
import org.eclipse.jetty.websocket.extensions.AbstractExtension;
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
/**
|
||||
* @TODO Implement proposed deflate frame draft
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
package org.eclipse.jetty.websocket.extensions.fragment;
|
||||
|
||||
import org.eclipse.jetty.websocket.extensions.AbstractExtension;
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
public class FragmentExtension extends AbstractExtension
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ import org.eclipse.jetty.websocket.api.StatusCode;
|
|||
import org.eclipse.jetty.websocket.api.WebSocketConnection;
|
||||
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
|
||||
import org.eclipse.jetty.websocket.callbacks.WebSocketCloseCallback;
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.frames.BinaryFrame;
|
||||
import org.eclipse.jetty.websocket.frames.CloseFrame;
|
||||
import org.eclipse.jetty.websocket.frames.TextFrame;
|
||||
import org.eclipse.jetty.websocket.generator.FrameGenerator;
|
||||
import org.eclipse.jetty.websocket.generator.Generator;
|
||||
import org.eclipse.jetty.websocket.parser.Parser;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
/**
|
||||
* Provides the implementation of {@link WebSocketConnection} within the framework of the new {@link AsyncConnection} framework of jetty-io
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import org.eclipse.jetty.util.B64Code;
|
|||
import org.eclipse.jetty.util.StringUtil;
|
||||
|
||||
/**
|
||||
* Logic for working with the <code>Sec-WebSocket-Accept</code> and <code>Sec-WebSocket-Accept</code> headers.
|
||||
* Logic for working with the <code>Sec-WebSocket-Key</code> and <code>Sec-WebSocket-Accept</code> headers.
|
||||
* <p>
|
||||
* This is kept separate from Connection objects to facilitate difference in behavior between client and server, as well as making testing easier.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package org.eclipse.jetty.websocket.extensions;
|
||||
package org.eclipse.jetty.websocket.protocol;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
|
@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||
import javax.servlet.http.HttpServletRequestWrapper;
|
||||
|
||||
import org.eclipse.jetty.util.QuotedStringTokenizer;
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
public class ServletWebSocketRequest extends HttpServletRequestWrapper implements WebSocketRequest
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import java.util.List;
|
|||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.servlet.http.HttpServletResponseWrapper;
|
||||
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
public class ServletWebSocketResponse extends HttpServletResponseWrapper implements WebSocketResponse
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package org.eclipse.jetty.websocket.server;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
public interface WebSocketRequest
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package org.eclipse.jetty.websocket.server;
|
|||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
|
||||
public interface WebSocketResponse
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ import org.eclipse.jetty.websocket.api.WebSocketPolicy;
|
|||
import org.eclipse.jetty.websocket.driver.EventMethodsCache;
|
||||
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
|
||||
import org.eclipse.jetty.websocket.extensions.Extension;
|
||||
import org.eclipse.jetty.websocket.extensions.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.extensions.deflate.DeflateFrameExtension;
|
||||
import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension;
|
||||
import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension;
|
||||
import org.eclipse.jetty.websocket.io.WebSocketAsyncConnection;
|
||||
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
|
||||
import org.eclipse.jetty.websocket.server.handshake.HandshakeHixie76;
|
||||
import org.eclipse.jetty.websocket.server.handshake.HandshakeRFC6455;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue