Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moving WebSocketHandler out of websocket-core into websocket-servlet

This commit is contained in:
Joakim Erdfelt 2012-06-18 09:37:07 -07:00
parent 6d09fb70fd
commit 4c18bd5f45
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java
View File

@ -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;

1
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java
View File

@ -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;

1
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
View File

@ -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;

1
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketOverSSLTest.java
View File

@ -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;

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketHandler.java → jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketHandler.java
View File

@ -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
{

1
jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/TestServer.java
View File

@ -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;