Moving classes around, stubbing out new classes for jetty-9 refactor

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

@@ -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.client;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -33,6 +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;
 
 
 /* ------------------------------------------------------------ */

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

@@ -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.client;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -49,6 +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;
 
 /* ------------------------------------------------------------ */
 /**

jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TestClient.java

@@ -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.client;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -28,6 +28,13 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.TypeUtil;
+import org.eclipse.jetty.websocket.WebSocket;
+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.client.WebSocketClient;
+import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
 
 /**
  * This is not a general purpose websocket client.

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

@@ -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.client;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -39,6 +39,13 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.eclipse.jetty.util.BlockingArrayQueue;
 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.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketConnection.java

@@ -20,6 +20,7 @@ import java.nio.ByteBuffer;
 import java.util.List;
 
 import org.eclipse.jetty.io.AsyncConnection;
+import org.eclipse.jetty.websocket.extensions.Extension;
 
 
 

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

@@ -50,6 +50,7 @@ import org.eclipse.jetty.websocket.WebSocket.OnBinaryMessage;
 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;
 
 
 /* ------------------------------------------------------------ */

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java

@@ -44,6 +44,12 @@ import org.eclipse.jetty.util.QuotedStringTokenizer;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.websocket.extensions.Extension;
+import org.eclipse.jetty.websocket.extensions.deflate.DeflateFrameExtension;
+import org.eclipse.jetty.websocket.extensions.fragment.FragmentExtension;
+import org.eclipse.jetty.websocket.extensions.identity.IdentityExtension;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketServletConnection;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketServletConnectionRFC6455;
 
 /**
  * Factory to create WebSocket connections

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocket.java

@@ -0,0 +1,12 @@
+package org.eclipse.jetty.websocket.api;
+
+public class WebSocket {
+	/**
+	 * Version in use by Safari / OSX
+	 */
+	public static final short DRAFT0 = 0;
+	/**
+	 * Version declared by RFC6455
+	 */
+	public static final short RFC6455 = 13;
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/WebSocketException.java

@@ -0,0 +1,23 @@
+package org.eclipse.jetty.websocket.api;
+
+/**
+ * A recoverable exception within the websocket framework.
+ */
+@SuppressWarnings("serial")
+public class WebSocketException extends RuntimeException {
+	public WebSocketException() {
+		super();
+	}
+
+	public WebSocketException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public WebSocketException(String message) {
+		super(message);
+	}
+
+	public WebSocketException(Throwable cause) {
+		super(cause);
+	}
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/AbstractExtension.java

@@ -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.extensions;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -21,6 +21,10 @@ import java.util.Map;
 
 
 import org.eclipse.jetty.util.QuotedStringTokenizer;
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketGenerator;
+import org.eclipse.jetty.websocket.WebSocketParser;
+import org.eclipse.jetty.websocket.WebSocket.FrameConnection;
 import org.eclipse.jetty.websocket.WebSocketParser.FrameHandler;
 
 public class AbstractExtension implements Extension

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/Extension.java

@@ -13,10 +13,16 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.extensions;
 
 import java.util.Map;
 
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketGenerator;
+import org.eclipse.jetty.websocket.WebSocketParser;
+import org.eclipse.jetty.websocket.WebSocket.FrameConnection;
+import org.eclipse.jetty.websocket.WebSocketParser.FrameHandler;
+
 public interface Extension extends WebSocketParser.FrameHandler, WebSocketGenerator
 {
     public String getName();

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/deflate/DeflateFrameExtension.java

@@ -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.extensions.deflate;
 
 import java.io.IOException;
 import java.util.Map;
@@ -25,6 +25,8 @@ import java.util.zip.Inflater;
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
+import org.eclipse.jetty.websocket.extensions.AbstractExtension;
 
 /**
  * @TODO Implement proposed deflate frame draft

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/fragment/FragmentExtension.java

@@ -13,11 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.extensions.fragment;
 
 import java.io.IOException;
 import java.util.Map;
 
+import org.eclipse.jetty.websocket.extensions.AbstractExtension;
+
 public class FragmentExtension extends AbstractExtension
 {
     private int _maxLength=-1;

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/extensions/identity/IdentityExtension.java

@@ -13,7 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.extensions.identity;
+
+import org.eclipse.jetty.websocket.extensions.AbstractExtension;
 
 public class IdentityExtension extends AbstractExtension
 {

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/BinaryFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class BinaryFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/CloseFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class CloseFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/ContinuationFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class ContinuationFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/ControlFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class ControlFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/ControlFrameType.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class ControlFrameType {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/PingFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class PingFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/PongFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class PongFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/frames/TextFrame.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.frames;
+
+public class TextFrame {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/ControlFrameGenerator.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.generator;
+
+public class ControlFrameGenerator {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/generator/Generator.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.generator;
+
+public class Generator {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/parser/ControlFrameBodyParser.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.parser;
+
+public class ControlFrameBodyParser {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/parser/ControlFrameParser.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.parser;
+
+public class ControlFrameParser {
+
+}

jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/parser/Parser.java

@@ -0,0 +1,5 @@
+package org.eclipse.jetty.websocket.parser;
+
+public class Parser {
+
+}

jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketCommTest.java

@@ -22,9 +22,11 @@ import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.websocket.helper.CaptureSocket;
-import org.eclipse.jetty.websocket.helper.MessageSender;
-import org.eclipse.jetty.websocket.helper.WebSocketCaptureServlet;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
+import org.eclipse.jetty.websocket.servlet.helper.CaptureSocket;
+import org.eclipse.jetty.websocket.servlet.helper.MessageSender;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketCaptureServlet;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

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

@@ -27,6 +27,8 @@ import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
 import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
 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.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/WebSocketRedeployTest.java

@@ -26,6 +26,9 @@ import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.websocket.client.WebSocketClient;
+import org.eclipse.jetty.websocket.client.WebSocketClientFactory;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketServlet;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;

jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java

@@ -26,7 +26,7 @@
 // You may elect to redistribute this code under either of these licenses.
 // ========================================================================
 
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.servlet;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
@@ -36,6 +36,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.websocket.WebSocketFactory;
+import org.eclipse.jetty.websocket.WebSocketFactory.Acceptor;
 
 /* ------------------------------------------------------------ */
 /**

jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletConnection.java

@@ -13,12 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.servlet;
 
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.jetty.websocket.WebSocketConnection;
+
 public interface WebSocketServletConnection extends WebSocketConnection
 {
     void handshake(HttpServletRequest request, HttpServletResponse response, String subprotocol) throws IOException;

jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletConnectionRFC6455.java

@@ -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.servlet;
 
 import java.io.IOException;
 import java.util.List;
@@ -21,6 +21,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
+import org.eclipse.jetty.websocket.WebSocketFactory;
+import org.eclipse.jetty.websocket.extensions.Extension;
 
 public class WebSocketServletConnectionRFC6455 extends WebSocketConnectionRFC6455 implements WebSocketServletConnection
 {

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

@@ -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.servlet;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -29,6 +29,15 @@ import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
+import org.eclipse.jetty.websocket.WebSocketHandler;
+import org.eclipse.jetty.websocket.WebSocket.Connection;
+import org.eclipse.jetty.websocket.WebSocket.FrameConnection;
+import org.eclipse.jetty.websocket.WebSocket.OnBinaryMessage;
+import org.eclipse.jetty.websocket.WebSocket.OnControl;
+import org.eclipse.jetty.websocket.WebSocket.OnFrame;
+import org.eclipse.jetty.websocket.WebSocket.OnTextMessage;
 
 public class TestServer extends Server
 {

jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/WebSocketServletRFCTest.java

@@ -1,4 +1,4 @@
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.servlet;
 
 import static org.hamcrest.Matchers.*;
 
@@ -20,7 +20,16 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.IO;
-import org.eclipse.jetty.websocket.helper.MessageSender;
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketGeneratorRFC6455Test;
+import org.eclipse.jetty.websocket.WebSocketMessageRFC6455Test;
+import org.eclipse.jetty.websocket.WebSocketParserRFC6455Test;
+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.servlet.helper.MessageSender;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketServlet;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;

jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/helper/CaptureSocket.java

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

jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/helper/MessageSender.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket.helper;
+package org.eclipse.jetty.websocket.servlet.helper;
 
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;

jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/helper/SafariD00.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket.helper;
+package org.eclipse.jetty.websocket.servlet.helper;
 
 import java.io.BufferedReader;
 import java.io.IOException;

jetty-websocket/websocket-servlet/src/test/java/org/eclipse/jetty/websocket/servlet/helper/WebSocketCaptureServlet.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket.helper;
+package org.eclipse.jetty.websocket.servlet.helper;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.helper.WebSocketServlet;
 
 @SuppressWarnings("serial") 
 public class WebSocketCaptureServlet extends WebSocketServlet