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

Moving MaskGen into org.eclipse.jetty.websocket.generator package space

This commit is contained in:
Joakim Erdfelt 2012-06-12 13:57:12 -07:00
parent c7b2297216
commit 6d09fb70fd
14 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
View File

@ -33,13 +33,13 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.MaskGen;
import org.eclipse.jetty.websocket.WebSocket;
import org.eclipse.jetty.websocket.WebSocketConnection;
import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
import org.eclipse.jetty.websocket.WebSocket.Connection;
import org.eclipse.jetty.websocket.WebSocket.FrameConnection;
import org.eclipse.jetty.websocket.WebSocket.OnFrame;
import org.eclipse.jetty.websocket.generator.MaskGen;
/* ------------------------------------------------------------ */

4
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClientFactory.java
View File

@ -49,12 +49,12 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
import org.eclipse.jetty.websocket.MaskGen;
import org.eclipse.jetty.websocket.RandomMaskGen;
import org.eclipse.jetty.websocket.WebSocket;
import org.eclipse.jetty.websocket.WebSocketConnection;
import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
import org.eclipse.jetty.websocket.extensions.Extension;
import org.eclipse.jetty.websocket.generator.MaskGen;
import org.eclipse.jetty.websocket.generator.RandomMaskGen;
/* ------------------------------------------------------------ */
/**

2
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
View File

@ -41,11 +41,11 @@ import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.websocket.WebSocket;
import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
import org.eclipse.jetty.websocket.ZeroMaskGen;
import org.eclipse.jetty.websocket.WebSocket.Connection;
import org.eclipse.jetty.websocket.WebSocket.OnTextMessage;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
import org.eclipse.jetty.websocket.generator.ZeroMaskGen;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

1
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
View File

@ -51,6 +51,7 @@ import org.eclipse.jetty.websocket.WebSocket.OnControl;
import org.eclipse.jetty.websocket.WebSocket.OnFrame;
import org.eclipse.jetty.websocket.WebSocket.OnTextMessage;
import org.eclipse.jetty.websocket.extensions.Extension;
import org.eclipse.jetty.websocket.generator.MaskGen;
/* ------------------------------------------------------------ */

1
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketGeneratorRFC6455.java
View File

@ -34,6 +34,7 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.websocket.generator.MaskGen;
/* ------------------------------------------------------------ */

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/FixedMaskGen.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/FixedMaskGen.java
View File

@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*******************************************************************************/
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.generator;
public class FixedMaskGen implements MaskGen

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/MaskGen.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/MaskGen.java
View File

@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*******************************************************************************/
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.generator;
public interface MaskGen
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/RandomMaskGen.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/RandomMaskGen.java
View File

@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*******************************************************************************/
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.generator;
import java.util.Random;

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/ZeroMaskGen.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/ZeroMaskGen.java
View File

@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*******************************************************************************/
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.generator;
public class ZeroMaskGen implements MaskGen

2
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketGeneratorRFC6455Test.java
View File

@ -21,6 +21,8 @@ import org.eclipse.jetty.io.ByteArrayBuffer;
import org.eclipse.jetty.io.ByteArrayEndPoint;
import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.generator.FixedMaskGen;
import org.eclipse.jetty.websocket.generator.MaskGen;
import org.junit.Before;
import org.junit.Test;

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

@ -41,6 +41,7 @@ import org.eclipse.jetty.server.handler.DefaultHandler;
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.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

@ -37,6 +37,7 @@ import org.eclipse.jetty.server.handler.DefaultHandler;
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.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;

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

@ -43,6 +43,8 @@ import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.util.StringUtil;
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.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

@ -29,6 +29,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
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.junit.After;
import org.junit.Assert;
import org.junit.Test;