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

Making websocket-core have a unique package org.eclipse.jetty.websocket.core to conform to osgi requirements

This commit is contained in:
Joakim Erdfelt 2012-09-18 10:01:01 -07:00
parent e9d0960e8d
commit b10a10797d
189 changed files with 768 additions and 701 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,12 @@ import java.io.IOException;
import java.net.URI;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.masks.Masker;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.core.api.UpgradeRequest;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver;
public interface WebSocketClient
{

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

@ -34,16 +34,16 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.util.thread.TimerScheduler;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.ExtensionRegistry;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.internal.ConnectionManager;
import org.eclipse.jetty.websocket.client.internal.IWebSocketClient;
import org.eclipse.jetty.websocket.driver.EventMethodsCache;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.ExtensionRegistry;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.EventMethodsCache;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public class WebSocketClientFactory extends AggregateLifeCycle
{

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

@ -26,8 +26,8 @@ import java.util.Random;
import org.eclipse.jetty.util.B64Code;
import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.UpgradeRequest;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
/**
* Allowing a generate from a UpgradeRequest

6
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/ClientUpgradeResponse.java
View File

@ -26,9 +26,9 @@ import java.util.List;
import java.util.Set;
import org.eclipse.jetty.util.MultiMap;
import org.eclipse.jetty.websocket.api.UpgradeException;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.UpgradeException;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public class ClientUpgradeResponse implements UpgradeResponse
{

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

@ -36,10 +36,10 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.client.internal.io.WebSocketClientSelectorManager;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
/**
* Internal Connection/Client Manager used to track active clients, their physical vs virtual connection information, and provide some means to create new

10
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/IWebSocketClient.java
View File

@ -25,15 +25,15 @@ import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
import org.eclipse.jetty.websocket.client.masks.Masker;
import org.eclipse.jetty.websocket.client.masks.RandomMasker;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.core.api.UpgradeRequest;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver;
/**
* WebSocketClient for working with Upgrade (request and response), and establishing connections to the websocket URI of your choice.

2
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParser.java
View File

@ -24,8 +24,8 @@ import java.util.regex.Pattern;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.Utf8LineParser;
import org.eclipse.jetty.websocket.api.UpgradeException;
import org.eclipse.jetty.websocket.client.internal.ClientUpgradeResponse;
import org.eclipse.jetty.websocket.core.api.UpgradeException;
/**
* Responsible for reading UTF8 Response Header lines and parsing them into a provided UpgradeResponse object.

20
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/UpgradeConnection.java
View File

@ -36,19 +36,19 @@ import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.UpgradeException;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.internal.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.internal.ClientUpgradeResponse;
import org.eclipse.jetty.websocket.client.internal.IWebSocketClient;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.io.OutgoingFrames;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.protocol.AcceptHash;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.UpgradeException;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.io.OutgoingFrames;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.protocol.AcceptHash;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
/**
* This is the initial connection handling that exists immediately after physical connection is established to destination server.

4
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientConnection.java
View File

@ -25,8 +25,8 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
import org.eclipse.jetty.websocket.client.internal.IWebSocketClient;
import org.eclipse.jetty.websocket.client.masks.Masker;
import org.eclipse.jetty.websocket.io.AbstractWebSocketConnection;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.io.AbstractWebSocketConnection;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Client side WebSocket physical connection.

2
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/internal/io/WebSocketClientSelectorManager.java
View File

@ -34,9 +34,9 @@ import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
import org.eclipse.jetty.websocket.client.internal.IWebSocketClient;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
public class WebSocketClientSelectorManager extends SelectorManager
{

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

@ -18,7 +18,7 @@
package org.eclipse.jetty.websocket.client.masks;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class FixedMasker implements Masker
{

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

@ -18,7 +18,7 @@
package org.eclipse.jetty.websocket.client.masks;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public interface Masker
{

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

@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.client.masks;
import java.util.Random;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class RandomMasker implements Masker
{

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

@ -20,7 +20,7 @@ package org.eclipse.jetty.websocket.client.masks;
import java.util.Arrays;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class ZeroMasker implements Masker
{

8
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java
View File

@ -22,12 +22,12 @@ import java.net.URI;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.io.AbstractWebSocketConnection;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.io.AbstractWebSocketConnection;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

4
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
View File

@ -26,10 +26,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.api.UpgradeException;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.core.api.UpgradeException;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

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

@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
public class ClientWriteThread extends Thread
{

6
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ServerReadThread.java
View File

@ -32,9 +32,9 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
public class ServerReadThread extends Thread

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

@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class ServerWriteThread extends Thread
{

4
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowClientTest.java
View File

@ -23,10 +23,10 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.toolchain.test.annotation.Slow;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

4
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/SlowServerTest.java
View File

@ -23,10 +23,10 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.toolchain.test.annotation.Slow;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

4
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TimeoutTest.java
View File

@ -22,10 +22,10 @@ import java.net.URI;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

4
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TrackingSocket.java
View File

@ -27,8 +27,8 @@ import java.util.concurrent.TimeoutException;
import org.eclipse.jetty.util.BlockingArrayQueue;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketAdapter;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketAdapter;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.junit.Assert;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;

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

@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.toolchain.test.AdvancedRunner;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer;
import org.eclipse.jetty.websocket.client.blockhead.BlockheadServer.ServerConnection;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.UpgradeRequest;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;

26
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/BlockheadServer.java
View File

@ -49,19 +49,19 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.extensions.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.io.OutgoingFrames;
import org.eclipse.jetty.websocket.protocol.AcceptHash;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.extensions.WebSocketExtensionRegistry;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.io.OutgoingFrames;
import org.eclipse.jetty.websocket.core.protocol.AcceptHash;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
/**

8
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/blockhead/IncomingFramesCapture.java
View File

@ -23,10 +23,10 @@ import java.util.LinkedList;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;

6
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/examples/TestClient.java
View File

@ -30,11 +30,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.WebSocketAdapter;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.core.api.WebSocketAdapter;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
/**
* This is not a general purpose websocket client. It's only for testing the websocket server and is hardwired to a specific draft version of the protocol.

2
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/internal/io/HttpResponseHeaderParserTest.java
View File

@ -24,7 +24,7 @@ import java.util.List;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.eclipse.jetty.websocket.core.api.UpgradeResponse;
import org.junit.Assert;
import org.junit.Test;

4
jetty-websocket/websocket-core/AllTests (websocket-core).launch
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/websocket-core/src/test/java/org/eclipse/jetty/websocket/AllTests.java"/>
<listEntry value="/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@ -11,7 +11,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.websocket.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jetty.websocket.core.AllTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="websocket-core"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketClose.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketClose.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.annotations;
package org.eclipse.jetty.websocket.core.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -24,7 +24,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
/**
* Annotation for tagging methods to receive connection close events.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketConnect.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketConnect.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.annotations;
package org.eclipse.jetty.websocket.core.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -24,7 +24,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
/**
* Annotation for tagging methods to receive connection open events.

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketFrame.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketFrame.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.annotations;
package org.eclipse.jetty.websocket.core.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@ -24,8 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* (ADVANCED) Annotation for tagging methods to receive frame events.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/OnWebSocketMessage.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/OnWebSocketMessage.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.annotations;
package org.eclipse.jetty.websocket.core.annotations;
import java.io.Reader;
import java.lang.annotation.Documented;
@ -25,7 +25,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
/**
* Annotation for tagging methods to receive Binary or Text Message events.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/annotations/WebSocket.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/annotations/WebSocket.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.annotations;
package org.eclipse.jetty.websocket.core.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BadPayloadException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BadPayloadException.java
View File

@ -16,9 +16,9 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import org.eclipse.jetty.websocket.extensions.permessage.CompressExtension;
import org.eclipse.jetty.websocket.core.extensions.permessage.CompressExtension;
/**
* Exception to terminate the connection because it has received data within a frame payload that was not consistent with the requirements of that frame

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/BaseConnection.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/BaseConnection.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.net.InetSocketAddress;

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/CloseException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/CloseException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
@SuppressWarnings("serial")
public class CloseException extends WebSocketException

10
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/Extension.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/Extension.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.io.IOException;
@ -25,10 +25,10 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.io.OutgoingFrames;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.io.OutgoingFrames;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public abstract class Extension implements OutgoingFrames, IncomingFrames
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ExtensionRegistry.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ExtensionRegistry.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.util.Iterator;

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/InvalidWebSocketException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/InvalidWebSocketException.java
View File

@ -16,9 +16,9 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import org.eclipse.jetty.websocket.annotations.WebSocket;
import org.eclipse.jetty.websocket.core.annotations.WebSocket;
/**
* Indicating that the provided Class is not a valid WebSocket as defined by the API.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/MessageTooLargeException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/MessageTooLargeException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Exception when a message is too large for the internal buffers occurs and should trigger a connection close.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/PolicyViolationException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/PolicyViolationException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Exception when a violation of policy occurs and should trigger a connection close.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/ProtocolException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/ProtocolException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Per spec, a protocol error should result in a Close frame of status code 1002 (PROTOCOL_ERROR)

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/StatusCode.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/StatusCode.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* The <a href="https://tools.ietf.org/html/rfc6455#section-7.4">RFC 6455 specified status codes</a> and <a

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/UpgradeException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/UpgradeException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Exception during WebSocket Upgrade Handshake.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/UpgradeRequest.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/UpgradeRequest.java
View File

@ -16,12 +16,12 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.util.List;
import java.util.Map;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public interface UpgradeRequest
{

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/UpgradeResponse.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/UpgradeResponse.java
View File

@ -16,14 +16,14 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public interface UpgradeResponse
{

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketAdapter.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketAdapter.java
View File

@ -16,9 +16,9 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import org.eclipse.jetty.websocket.api.io.WebSocketBlockingConnection;
import org.eclipse.jetty.websocket.core.api.io.WebSocketBlockingConnection;
/**
* Default implementation of the {@link WebSocketListener}.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketBehavior.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketBehavior.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Behavior for how the WebSocket should operate.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketConnection.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketConnection.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
import java.io.IOException;
import java.nio.ByteBuffer;

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketException.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* A recoverable exception within the websocket framework.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketListener.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketListener.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**
* Basic WebSocket Listener interface for incoming WebSocket events.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketPolicy.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/WebSocketPolicy.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api;
package org.eclipse.jetty.websocket.core.api;
/**

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/io/WebSocketBlockingConnection.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api.io;
package org.eclipse.jetty.websocket.core.api.io;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
@ -24,8 +24,8 @@ import java.util.concurrent.ExecutionException;
import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
/**
* For working with the {@link WebSocketConnection} in a blocking technique.

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketOutputStream.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/io/WebSocketOutputStream.java
View File

@ -16,13 +16,13 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api.io;
package org.eclipse.jetty.websocket.core.api.io;
import java.io.IOException;
import java.io.OutputStream;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
public class WebSocketOutputStream extends OutputStream
{

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/api/io/WebSocketWriter.java
View File

@ -16,15 +16,15 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.api.io;
package org.eclipse.jetty.websocket.core.api.io;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.Charset;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
public class WebSocketWriter extends Writer
{

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/EventMethod.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/driver/EventMethod.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.driver;
package org.eclipse.jetty.websocket.core.driver;
import java.io.InputStream;
import java.io.Reader;
@ -25,8 +25,8 @@ import java.lang.reflect.Method;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
public class EventMethod
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/EventMethods.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/driver/EventMethods.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.driver;
package org.eclipse.jetty.websocket.core.driver;
/**
* A representation of the methods available to call for a particular class.

22
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/EventMethodsCache.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/driver/EventMethodsCache.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.driver;
package org.eclipse.jetty.websocket.core.driver;
import java.io.InputStream;
import java.io.Reader;
@ -27,16 +27,16 @@ import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.annotations.OnWebSocketClose;
import org.eclipse.jetty.websocket.annotations.OnWebSocketConnect;
import org.eclipse.jetty.websocket.annotations.OnWebSocketFrame;
import org.eclipse.jetty.websocket.annotations.OnWebSocketMessage;
import org.eclipse.jetty.websocket.annotations.WebSocket;
import org.eclipse.jetty.websocket.api.InvalidWebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketListener;
import org.eclipse.jetty.websocket.protocol.Frame;
import org.eclipse.jetty.websocket.core.annotations.OnWebSocketClose;
import org.eclipse.jetty.websocket.core.annotations.OnWebSocketConnect;
import org.eclipse.jetty.websocket.core.annotations.OnWebSocketFrame;
import org.eclipse.jetty.websocket.core.annotations.OnWebSocketMessage;
import org.eclipse.jetty.websocket.core.annotations.WebSocket;
import org.eclipse.jetty.websocket.core.api.InvalidWebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketListener;
import org.eclipse.jetty.websocket.core.protocol.Frame;
public class EventMethodsCache
{

38
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/driver/WebSocketEventDriver.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/driver/WebSocketEventDriver.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.driver;
package org.eclipse.jetty.websocket.core.driver;
import java.nio.ByteBuffer;
@ -27,24 +27,24 @@ import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
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.BaseConnection;
import org.eclipse.jetty.websocket.api.CloseException;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketListener;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.io.message.MessageAppender;
import org.eclipse.jetty.websocket.io.message.MessageInputStream;
import org.eclipse.jetty.websocket.io.message.MessageReader;
import org.eclipse.jetty.websocket.io.message.SimpleBinaryMessage;
import org.eclipse.jetty.websocket.io.message.SimpleTextMessage;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.Frame;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.annotations.WebSocket;
import org.eclipse.jetty.websocket.core.api.BaseConnection;
import org.eclipse.jetty.websocket.core.api.CloseException;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketListener;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.io.message.MessageAppender;
import org.eclipse.jetty.websocket.core.io.message.MessageInputStream;
import org.eclipse.jetty.websocket.core.io.message.MessageReader;
import org.eclipse.jetty.websocket.core.io.message.SimpleBinaryMessage;
import org.eclipse.jetty.websocket.core.io.message.SimpleTextMessage;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.Frame;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Responsible for routing the internally generated events destined for a specific WebSocket instance to whatever choice of development style the developer has

18
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/WebSocketExtensionRegistry.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/extensions/WebSocketExtensionRegistry.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.extensions;
package org.eclipse.jetty.websocket.core.extensions;
import java.util.ArrayList;
import java.util.HashMap;
@ -26,14 +26,14 @@ import java.util.Map;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.ExtensionRegistry;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension;
import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension;
import org.eclipse.jetty.websocket.extensions.permessage.CompressExtension;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.ExtensionRegistry;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.extensions.fragment.FragmentExtension;
import org.eclipse.jetty.websocket.core.extensions.identity.IdentityExtension;
import org.eclipse.jetty.websocket.core.extensions.permessage.CompressExtension;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public class WebSocketExtensionRegistry implements ExtensionRegistry
{

10
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/extensions/fragment/FragmentExtension.java
View File

@ -16,16 +16,16 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.extensions.fragment;
package org.eclipse.jetty.websocket.core.extensions.fragment;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class FragmentExtension extends Extension
{

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/identity/IdentityExtension.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/extensions/identity/IdentityExtension.java
View File

@ -16,11 +16,11 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.extensions.identity;
package org.eclipse.jetty.websocket.core.extensions.identity;
import org.eclipse.jetty.util.QuotedStringTokenizer;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
public class IdentityExtension extends Extension
{

12
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/permessage/CompressExtension.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/extensions/permessage/CompressExtension.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.extensions.permessage;
package org.eclipse.jetty.websocket.core.extensions.permessage;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -28,11 +28,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.BadPayloadException;
import org.eclipse.jetty.websocket.api.Extension;
import org.eclipse.jetty.websocket.api.MessageTooLargeException;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BadPayloadException;
import org.eclipse.jetty.websocket.core.api.Extension;
import org.eclipse.jetty.websocket.core.api.MessageTooLargeException;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Per Message Compression extension for WebSocket.

24
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/AbstractWebSocketConnection.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/AbstractWebSocketConnection.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.io.IOException;
import java.net.InetSocketAddress;
@ -37,17 +37,17 @@ import org.eclipse.jetty.util.FutureCallback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.websocket.api.BaseConnection;
import org.eclipse.jetty.websocket.api.CloseException;
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.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BaseConnection;
import org.eclipse.jetty.websocket.core.api.CloseException;
import org.eclipse.jetty.websocket.core.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.ExtensionConfig;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Provides the implementation of {@link WebSocketConnection} within the framework of the new {@link Connection} framework of jetty-io

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/ControlFrameBytes.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/ControlFrameBytes.java
View File

@ -16,16 +16,16 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.nio.ByteBuffer;
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.BaseConnection;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BaseConnection;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class ControlFrameBytes<C> extends FrameBytes<C>
{

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/DataFrameBytes.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/DataFrameBytes.java
View File

@ -16,14 +16,14 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.nio.ByteBuffer;
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.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class DataFrameBytes<C> extends FrameBytes<C>
{

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameBytes.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameBytes.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.nio.ByteBuffer;
import java.nio.channels.InterruptedByTimeoutException;
@ -26,7 +26,7 @@ import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public abstract class FrameBytes<C> implements Callback<C>, Runnable
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/FrameQueue.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/FrameQueue.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.util.LinkedList;

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/IncomingFrames.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/IncomingFrames.java
View File

@ -16,10 +16,10 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Interface for dealing with Incoming Frames.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/OutgoingFrames.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/OutgoingFrames.java
View File

@ -16,12 +16,12 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.io.IOException;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Interface for dealing with outgoing frames.

16
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/WebSocketSession.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/WebSocketSession.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io;
package org.eclipse.jetty.websocket.core.io;
import java.io.IOException;
import java.net.InetSocketAddress;
@ -26,13 +26,13 @@ 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.BaseConnection;
import org.eclipse.jetty.websocket.api.WebSocketConnection;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BaseConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketConnection;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriver;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class WebSocketSession implements WebSocketConnection, IncomingFrames, OutgoingFrames
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageAppender.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageAppender.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.message;
package org.eclipse.jetty.websocket.core.io.message;
import java.io.IOException;
import java.nio.ByteBuffer;

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageInputStream.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageInputStream.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.message;
package org.eclipse.jetty.websocket.core.io.message;
import java.io.IOException;
import java.io.InputStream;
@ -24,9 +24,9 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.EventMethod;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.EventMethod;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
/**
* Support class for reading binary message data as an InputStream.

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/MessageReader.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/MessageReader.java
View File

@ -16,16 +16,16 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.message;
package org.eclipse.jetty.websocket.core.io.message;
import java.io.IOException;
import java.io.Reader;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.EventMethod;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.EventMethod;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
/**
* Support class for reading text message data as an Reader.

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleBinaryMessage.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleBinaryMessage.java
View File

@ -16,16 +16,16 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.message;
package org.eclipse.jetty.websocket.core.io.message;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.EventMethod;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.EventMethod;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
public class SimpleBinaryMessage implements MessageAppender
{

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/message/SimpleTextMessage.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/message/SimpleTextMessage.java
View File

@ -16,15 +16,15 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.message;
package org.eclipse.jetty.websocket.core.io.message;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.driver.EventMethod;
import org.eclipse.jetty.websocket.io.WebSocketSession;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.driver.EventMethod;
import org.eclipse.jetty.websocket.core.io.WebSocketSession;
public class SimpleTextMessage implements MessageAppender
{

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/BinaryValidator.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/BinaryValidator.java
View File

@ -16,11 +16,11 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.payload;
package org.eclipse.jetty.websocket.core.io.payload;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Binary payload validator does nothing, essentially.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/CloseReasonValidator.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/CloseReasonValidator.java
View File

@ -16,11 +16,11 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.payload;
package org.eclipse.jetty.websocket.core.io.payload;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
/**
* Validate UTF8 correctness for {@link OpCode#CLOSE} Reason message.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/DeMaskProcessor.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/DeMaskProcessor.java
View File

@ -16,11 +16,11 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.payload;
package org.eclipse.jetty.websocket.core.io.payload;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
public class DeMaskProcessor implements PayloadProcessor
{

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/PayloadProcessor.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/PayloadProcessor.java
View File

@ -16,12 +16,12 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.payload;
package org.eclipse.jetty.websocket.core.io.payload;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.api.BadPayloadException;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BadPayloadException;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Process the payload (for demasking, validating, etc..)

6
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/io/payload/UTF8Validator.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/io/payload/UTF8Validator.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.io.payload;
package org.eclipse.jetty.websocket.core.io.payload;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -25,8 +25,8 @@ import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Utf8Appendable;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.BadPayloadException;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.BadPayloadException;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
/**
* Used to perform validation of UTF8 payload contents (for fast-fail reasons)

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/AcceptHash.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/AcceptHash.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/CloseInfo.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/CloseInfo.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.nio.ByteBuffer;
@ -26,9 +26,9 @@ import org.eclipse.jetty.util.Utf8Appendable.NotUtf8Exception;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.BadPayloadException;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.core.api.BadPayloadException;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.StatusCode;
public class CloseInfo
{

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/ExtensionConfig.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/ExtensionConfig.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.util.HashMap;
import java.util.Map;

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Frame.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Frame.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.nio.ByteBuffer;

8
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Generator.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Generator.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.nio.ByteBuffer;
@ -24,9 +24,9 @@ import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
/**
* Generating a frame in WebSocket land.

2
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/OpCode.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/OpCode.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
public final class OpCode
{

22
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/Parser.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/Parser.java
View File

@ -16,23 +16,23 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.websocket.api.MessageTooLargeException;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.io.IncomingFrames;
import org.eclipse.jetty.websocket.io.payload.BinaryValidator;
import org.eclipse.jetty.websocket.io.payload.CloseReasonValidator;
import org.eclipse.jetty.websocket.io.payload.DeMaskProcessor;
import org.eclipse.jetty.websocket.io.payload.PayloadProcessor;
import org.eclipse.jetty.websocket.io.payload.UTF8Validator;
import org.eclipse.jetty.websocket.core.api.MessageTooLargeException;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.io.IncomingFrames;
import org.eclipse.jetty.websocket.core.io.payload.BinaryValidator;
import org.eclipse.jetty.websocket.core.io.payload.CloseReasonValidator;
import org.eclipse.jetty.websocket.core.io.payload.DeMaskProcessor;
import org.eclipse.jetty.websocket.core.io.payload.PayloadProcessor;
import org.eclipse.jetty.websocket.core.io.payload.UTF8Validator;
/**
* Parsing of a frames in WebSocket land.

4
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/protocol/WebSocketFrame.java → jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/protocol/WebSocketFrame.java
View File

@ -16,13 +16,13 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.protocol;
package org.eclipse.jetty.websocket.core.protocol;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
/**
* A Base Frame as seen in <a href="https://tools.ietf.org/html/rfc6455#section-5.2">RFC 6455. Sec 5.2</a>

10
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/AllTests.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AllTests.java
View File

@ -16,17 +16,17 @@
// ========================================================================
//
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.core;
import org.eclipse.jetty.websocket.driver.EventMethodsCacheTest;
import org.eclipse.jetty.websocket.driver.WebSocketEventDriverTest;
import org.eclipse.jetty.websocket.core.driver.EventMethodsCacheTest;
import org.eclipse.jetty.websocket.core.driver.WebSocketEventDriverTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses(
{ org.eclipse.jetty.websocket.ab.AllTests.class, EventMethodsCacheTest.class, WebSocketEventDriverTest.class,
org.eclipse.jetty.websocket.extensions.AllTests.class, org.eclipse.jetty.websocket.protocol.AllTests.class, GeneratorParserRoundtripTest.class })
{ org.eclipse.jetty.websocket.core.ab.AllTests.class, EventMethodsCacheTest.class, WebSocketEventDriverTest.class,
org.eclipse.jetty.websocket.core.extensions.AllTests.class, org.eclipse.jetty.websocket.core.protocol.AllTests.class, GeneratorParserRoundtripTest.class })
public class AllTests
{
/* nothing to do here */

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

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.core;
import java.nio.ByteBuffer;

14
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/GeneratorParserRoundtripTest.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundtripTest.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket;
package org.eclipse.jetty.websocket.core;
import static org.hamcrest.Matchers.*;
@ -26,12 +26,12 @@ import java.util.Arrays;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.MappedByteBufferPool;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import org.junit.Test;

2
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/AllTests.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/AllTests.java
View File

@ -16,7 +16,7 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

20
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_1.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_1.java
View File

@ -16,19 +16,19 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.ByteBufferAssert;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.ByteBufferAssert;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import org.junit.Test;

20
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase1_2.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase1_2.java
View File

@ -16,20 +16,20 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.websocket.ByteBufferAssert;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.ByteBufferAssert;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import org.junit.Test;

24
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase2.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase2.java
View File

@ -16,22 +16,22 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.eclipse.jetty.websocket.ByteBufferAssert;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.ByteBufferAssert;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import org.junit.Test;

12
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase3.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase3.java
View File

@ -16,17 +16,17 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

12
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase4.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase4.java
View File

@ -16,15 +16,15 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.nio.ByteBuffer;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketException;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketException;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.junit.Assert;
import org.junit.Test;

24
jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/ab/TestABCase7_3.java → jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ab/TestABCase7_3.java
View File

@ -16,24 +16,24 @@
// ========================================================================
//
package org.eclipse.jetty.websocket.ab;
package org.eclipse.jetty.websocket.core.ab;
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.websocket.ByteBufferAssert;
import org.eclipse.jetty.websocket.api.ProtocolException;
import org.eclipse.jetty.websocket.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.protocol.CloseInfo;
import org.eclipse.jetty.websocket.protocol.Generator;
import org.eclipse.jetty.websocket.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.protocol.OpCode;
import org.eclipse.jetty.websocket.protocol.Parser;
import org.eclipse.jetty.websocket.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
import org.eclipse.jetty.websocket.core.ByteBufferAssert;
import org.eclipse.jetty.websocket.core.api.ProtocolException;
import org.eclipse.jetty.websocket.core.api.WebSocketBehavior;
import org.eclipse.jetty.websocket.core.api.WebSocketPolicy;
import org.eclipse.jetty.websocket.core.protocol.CloseInfo;
import org.eclipse.jetty.websocket.core.protocol.Generator;
import org.eclipse.jetty.websocket.core.protocol.IncomingFramesCapture;
import org.eclipse.jetty.websocket.core.protocol.OpCode;
import org.eclipse.jetty.websocket.core.protocol.Parser;
import org.eclipse.jetty.websocket.core.protocol.UnitGenerator;
import org.eclipse.jetty.websocket.core.protocol.WebSocketFrame;
import org.junit.Assert;
import org.junit.Test;

Some files were not shown because too many files have changed in this diff Show More