Renaming module and groupId for websocket-servlet to websocket-server to better reflect nature of module

jetty-websocket/pom.xml

@@ -15,7 +15,7 @@
     <modules>
       <module>websocket-core</module>
       <module>websocket-client</module>
-      <module>websocket-servlet</module>
+      <module>websocket-server</module>
     </modules>
 
     <build>

jetty-websocket/websocket-server/pom.xml

@@ -7,11 +7,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>websocket-servlet</artifactId>
-    <name>Jetty :: Websocket :: Servlet</name>
+    <artifactId>websocket-server</artifactId>
+    <name>Jetty :: Websocket :: Server</name>
 
     <properties>
-        <bundle-symbolic-name>${project.groupId}.websocket.servlet</bundle-symbolic-name>
+        <bundle-symbolic-name>${project.groupId}.websocket.server</bundle-symbolic-name>
     </properties>
 
     <dependencies>
@@ -42,6 +42,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-test-helper</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,18 +1,3 @@
-/*******************************************************************************
- * Copyright (c) 2011 Intalio, Inc.
- * ======================================================================
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- *   The Eclipse Public License is available at
- *   http://www.eclipse.org/legal/epl-v10.html
- *
- *   The Apache License v2.0 is available at
- *   http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- *******************************************************************************/
 // ========================================================================
 // Copyright (c) 2010 Mort Bay Consulting Pty. Ltd.
 // ------------------------------------------------------------------------
@@ -26,7 +11,7 @@
 // You may elect to redistribute this code under either of these licenses.
 // ========================================================================
 
-package org.eclipse.jetty.websocket;
+package org.eclipse.jetty.websocket.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -44,12 +29,13 @@ 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.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketConnectionRFC6455;
+import org.eclipse.jetty.websocket.WebSocket.Connection;
 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-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketHandler.java

@@ -26,7 +26,7 @@
 // You may elect to redistribute this code under either of these licenses. 
 // ========================================================================
 
-package org.eclipse.jetty.websocket.servlet;
+package org.eclipse.jetty.websocket.server;
 
 import java.io.IOException;
 
@@ -36,8 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.websocket.WebSocketFactory;
-import org.eclipse.jetty.websocket.WebSocketFactory.Acceptor;
+import org.eclipse.jetty.websocket.server.WebSocketFactory.Acceptor;
 
 public abstract class WebSocketHandler extends HandlerWrapper implements WebSocketFactory.Acceptor
 {

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

@@ -26,7 +26,7 @@
 // You may elect to redistribute this code under either of these licenses.
 // ========================================================================
 
-package org.eclipse.jetty.websocket.servlet;
+package org.eclipse.jetty.websocket.server;
 
 import java.io.IOException;
 import javax.servlet.ServletException;
@@ -36,8 +36,7 @@ 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;
+import org.eclipse.jetty.websocket.server.WebSocketFactory.Acceptor;
 
 /* ------------------------------------------------------------ */
 /**

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

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

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

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  *******************************************************************************/
-package org.eclipse.jetty.websocket.servlet;
+package org.eclipse.jetty.websocket.server;
 
 import java.io.IOException;
 import java.util.List;
@@ -23,7 +23,6 @@ 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-server/src/test/java/org/eclipse/jetty/websocket/server/TestServer.java

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

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

@@ -1,4 +1,4 @@
-package org.eclipse.jetty.websocket.servlet;
+package org.eclipse.jetty.websocket.server;
 
 import static org.hamcrest.Matchers.*;
 

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

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

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

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

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

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

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

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