From 8fa35533b637090339dfedd4e5cf76e9fbadcf00 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 5 Jul 2012 16:29:14 -0700 Subject: [PATCH] Moving ExtensionConfig out of .api and into .extensions where it belongs --- .../eclipse/jetty/websocket/extensions/AbstractExtension.java | 1 - .../java/org/eclipse/jetty/websocket/extensions/Extension.java | 1 - .../jetty/websocket/{api => extensions}/ExtensionConfig.java | 2 +- .../websocket/extensions/deflate/DeflateFrameExtension.java | 2 +- .../jetty/websocket/extensions/fragment/FragmentExtension.java | 2 +- .../eclipse/jetty/websocket/io/WebSocketAsyncConnection.java | 2 +- .../eclipse/jetty/websocket/server/ServletWebSocketRequest.java | 2 +- .../jetty/websocket/server/ServletWebSocketResponse.java | 2 +- .../org/eclipse/jetty/websocket/server/WebSocketRequest.java | 2 +- .../org/eclipse/jetty/websocket/server/WebSocketResponse.java | 2 +- .../eclipse/jetty/websocket/server/WebSocketServerFactory.java | 2 +- 11 files changed, 9 insertions(+), 11 deletions(-) rename jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/{api => extensions}/ExtensionConfig.java (98%) diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java index fe460689ad5..27da18f8fdf 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java @@ -15,7 +15,6 @@ *******************************************************************************/ package org.eclipse.jetty.websocket.extensions; -import org.eclipse.jetty.websocket.api.ExtensionConfig; public class AbstractExtension implements Extension { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java index 715b2d1385c..3b84265fe40 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java @@ -15,7 +15,6 @@ *******************************************************************************/ package org.eclipse.jetty.websocket.extensions; -import org.eclipse.jetty.websocket.api.ExtensionConfig; public interface Extension { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionConfig.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/ExtensionConfig.java similarity index 98% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionConfig.java rename to jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/ExtensionConfig.java index ad56f10f8fe..005036d0c0b 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionConfig.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/ExtensionConfig.java @@ -1,4 +1,4 @@ -package org.eclipse.jetty.websocket.api; +package org.eclipse.jetty.websocket.extensions; import java.util.HashMap; import java.util.Map; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java index b8bde1b2ab4..16e01aa852f 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java @@ -20,8 +20,8 @@ import java.util.zip.Inflater; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.AbstractExtension; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; /** * @TODO Implement proposed deflate frame draft diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java index 163c321a0e1..d8a5add2b1a 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java @@ -15,8 +15,8 @@ *******************************************************************************/ package org.eclipse.jetty.websocket.extensions.fragment; -import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.extensions.AbstractExtension; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; public class FragmentExtension extends AbstractExtension { diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java index 3e157054e0d..060f57f6c3f 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java +++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketAsyncConnection.java @@ -16,11 +16,11 @@ import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.websocket.api.ExtensionConfig; 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; diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java index 4857313f0fc..f1cd3c49dfe 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java @@ -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.api.ExtensionConfig; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; public class ServletWebSocketRequest extends HttpServletRequestWrapper implements WebSocketRequest { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java index 236dc96adf4..6afd1ae64dc 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketResponse.java @@ -7,7 +7,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.eclipse.jetty.websocket.api.ExtensionConfig; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; public class ServletWebSocketResponse extends HttpServletResponseWrapper implements WebSocketResponse { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketRequest.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketRequest.java index 718f29440e9..56287b2162c 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketRequest.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketRequest.java @@ -2,7 +2,7 @@ package org.eclipse.jetty.websocket.server; import java.util.List; -import org.eclipse.jetty.websocket.api.ExtensionConfig; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; public interface WebSocketRequest { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketResponse.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketResponse.java index 7569093f4e0..eaf6ae299ae 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketResponse.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketResponse.java @@ -3,7 +3,7 @@ package org.eclipse.jetty.websocket.server; import java.io.IOException; import java.util.List; -import org.eclipse.jetty.websocket.api.ExtensionConfig; +import org.eclipse.jetty.websocket.extensions.ExtensionConfig; public interface WebSocketResponse { diff --git a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java index e0420f0a57c..4f4e8026f54 100644 --- a/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java +++ b/jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java @@ -34,12 +34,12 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.annotations.WebSocket; -import org.eclipse.jetty.websocket.api.ExtensionConfig; import org.eclipse.jetty.websocket.api.WebSocketException; 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;