Issue jetty#3165 - rearrange packages for javax-websocket-server tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
lachlan-roberts · Feb 19, 2019 · beff8a2 · beff8a2
1 parent 83b53f1
commit beff8a2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 26 deletions.
diff --git a/...java/examples/JsrBrowserConfigurator.java → ...erver/browser/JsrBrowserConfigurator.java b/...java/examples/JsrBrowserConfigurator.java → ...erver/browser/JsrBrowserConfigurator.java
@@ -16,16 +16,17 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
-import org.eclipse.jetty.http.QuotedCSV;
+import java.util.Collections;
+import java.util.List;
 
 import javax.websocket.Extension;
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import java.util.Collections;
-import java.util.List;
+
+import org.eclipse.jetty.http.QuotedCSV;
 
 public class JsrBrowserConfigurator extends ServerEndpointConfig.Configurator
 {

diff --git a/...st/java/examples/JsrBrowserDebugTool.java → ...x/server/browser/JsrBrowserDebugTool.java b/...st/java/examples/JsrBrowserDebugTool.java → ...x/server/browser/JsrBrowserDebugTool.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

diff --git a/.../test/java/examples/JsrBrowserSocket.java → ...avax/server/browser/JsrBrowserSocket.java b/.../test/java/examples/JsrBrowserSocket.java → ...avax/server/browser/JsrBrowserSocket.java
@@ -16,11 +16,14 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.browser;
 
-import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.Random;
+import java.util.Set;
 
 import javax.websocket.CloseReason;
 import javax.websocket.OnClose;
@@ -29,12 +32,10 @@
 import javax.websocket.RemoteEndpoint.Async;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
+
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
 
 @ServerEndpoint(value = "/", subprotocols = { "tool" }, configurator = JsrBrowserConfigurator.class)
 public class JsrBrowserSocket

diff --git a/.../examples/GetHttpSessionConfigurator.java → .../examples/GetHttpSessionConfigurator.java b/.../examples/GetHttpSessionConfigurator.java → .../examples/GetHttpSessionConfigurator.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.HandshakeResponse;

diff --git a/...t/java/examples/GetHttpSessionSocket.java → ...server/examples/GetHttpSessionSocket.java b/...t/java/examples/GetHttpSessionSocket.java → ...server/examples/GetHttpSessionSocket.java
@@ -16,15 +16,16 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
+
+import java.io.IOException;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.EndpointConfig;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
 
 @ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class)
 public class GetHttpSessionSocket

diff --git a/...t/java/examples/MyAuthedConfigurator.java → ...server/examples/MyAuthedConfigurator.java b/...t/java/examples/MyAuthedConfigurator.java → ...server/examples/MyAuthedConfigurator.java
@@ -16,12 +16,13 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
+
+import java.security.Principal;
 
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
 import javax.websocket.server.ServerEndpointConfig;
-import java.security.Principal;
 
 public class MyAuthedConfigurator extends ServerEndpointConfig.Configurator
 {

diff --git a/...rc/test/java/examples/MyAuthedSocket.java → ...javax/server/examples/MyAuthedSocket.java b/...rc/test/java/examples/MyAuthedSocket.java → ...javax/server/examples/MyAuthedSocket.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
 import javax.websocket.OnMessage;
 import javax.websocket.server.ServerEndpoint;

diff --git a/...st/java/examples/StreamingEchoSocket.java → .../server/examples/StreamingEchoSocket.java b/...st/java/examples/StreamingEchoSocket.java → .../server/examples/StreamingEchoSocket.java
@@ -16,16 +16,17 @@
 //  ========================================================================
 //
 
-package examples;
+package org.eclipse.jetty.websocket.javax.server.examples;
 
-import org.eclipse.jetty.util.IO;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 
 import javax.websocket.OnMessage;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
+
+import org.eclipse.jetty.util.IO;
 
 @ServerEndpoint("/echo")
 public class StreamingEchoSocket