From 4c18bd5f454a6aea747bda18d525d73de983a7a4 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Jun 2012 09:37:07 -0700 Subject: [PATCH] Moving WebSocketHandler out of websocket-core into websocket-servlet --- .../org/eclipse/jetty/websocket/WebSocketLoadD08Test.java | 1 + .../org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java | 1 + .../eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java | 1 + .../org/eclipse/jetty/websocket/WebSocketOverSSLTest.java | 1 + .../eclipse/jetty/websocket/servlet}/WebSocketHandler.java | 4 +++- .../java/org/eclipse/jetty/websocket/servlet/TestServer.java | 1 - 6 files changed, 7 insertions(+), 2 deletions(-) rename jetty-websocket/{websocket-core/src/main/java/org/eclipse/jetty/websocket => websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet}/WebSocketHandler.java (94%) diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java index c09522d43cf..676588f22a9 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java @@ -42,6 +42,7 @@ import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.generator.FixedMaskGen; +import org.eclipse.jetty.websocket.servlet.WebSocketHandler; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java index abb07c05346..a7afaf1e9b9 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java @@ -38,6 +38,7 @@ import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.generator.FixedMaskGen; +import org.eclipse.jetty.websocket.servlet.WebSocketHandler; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java index a6e087bd6f2..9ff693b87d2 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java @@ -45,6 +45,7 @@ import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.Utf8StringBuilder; import org.eclipse.jetty.websocket.generator.MaskGen; import org.eclipse.jetty.websocket.generator.RandomMaskGen; +import org.eclipse.jetty.websocket.servlet.WebSocketHandler; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketOverSSLTest.java b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketOverSSLTest.java index bbea96056c8..287fb1fe956 100644 --- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketOverSSLTest.java +++ b/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketOverSSLTest.java @@ -30,6 +30,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClientFactory; import org.eclipse.jetty.websocket.generator.ZeroMaskGen; +import org.eclipse.jetty.websocket.servlet.WebSocketHandler; import org.junit.After; import org.junit.Assert; import org.junit.Test; diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketHandler.java similarity index 94% rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java rename to jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketHandler.java index d90780f5c3d..754549ee8bb 100644 --- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java +++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketHandler.java @@ -26,7 +26,7 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== -package org.eclipse.jetty.websocket; +package org.eclipse.jetty.websocket.servlet; import java.io.IOException; @@ -36,6 +36,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.HandlerWrapper; +import org.eclipse.jetty.websocket.WebSocketFactory; +import org.eclipse.jetty.websocket.WebSocketFactory.Acceptor; public abstract class WebSocketHandler extends HandlerWrapper implements WebSocketFactory.Acceptor { diff --git a/jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/TestServer.java b/jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/TestServer.java index 94a1ca0663e..49163a281d4 100644 --- a/jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/TestServer.java +++ b/jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/TestServer.java @@ -31,7 +31,6 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.WebSocket; import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455; -import org.eclipse.jetty.websocket.WebSocketHandler; import org.eclipse.jetty.websocket.WebSocket.Connection; import org.eclipse.jetty.websocket.WebSocket.FrameConnection; import org.eclipse.jetty.websocket.WebSocket.OnBinaryMessage;