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

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

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-02-11 18:51:51 +11:00
parent 83b53f102c
commit beff8a208e
8 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserConfigurator.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserConfigurator.java
View File

@ -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.Extension;
import javax.websocket.HandshakeResponse; import javax.websocket.HandshakeResponse;
import javax.websocket.server.HandshakeRequest; import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig; 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 public class JsrBrowserConfigurator extends ServerEndpointConfig.Configurator
{ {

2
jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserDebugTool.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserDebugTool.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package examples; package org.eclipse.jetty.websocket.javax.server.browser;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;

21
jetty-websocket/javax-websocket-server/src/test/java/examples/JsrBrowserSocket.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/browser/JsrBrowserSocket.java
View File

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

2
jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionConfigurator.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionConfigurator.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package examples; package org.eclipse.jetty.websocket.javax.server.examples;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import javax.websocket.HandshakeResponse; import javax.websocket.HandshakeResponse;

5
jetty-websocket/javax-websocket-server/src/test/java/examples/GetHttpSessionSocket.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/GetHttpSessionSocket.java
View File

@ -16,7 +16,9 @@
// ======================================================================== // ========================================================================
// //
package examples; package org.eclipse.jetty.websocket.javax.server.examples;
import java.io.IOException;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import javax.websocket.EndpointConfig; import javax.websocket.EndpointConfig;
@ -24,7 +26,6 @@ import javax.websocket.OnMessage;
import javax.websocket.OnOpen; import javax.websocket.OnOpen;
import javax.websocket.Session; import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
@ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class) @ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class)
public class GetHttpSessionSocket public class GetHttpSessionSocket

5
jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedConfigurator.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedConfigurator.java
View File

@ -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.HandshakeResponse;
import javax.websocket.server.HandshakeRequest; import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig; import javax.websocket.server.ServerEndpointConfig;
import java.security.Principal;
public class MyAuthedConfigurator extends ServerEndpointConfig.Configurator public class MyAuthedConfigurator extends ServerEndpointConfig.Configurator
{ {

2
jetty-websocket/javax-websocket-server/src/test/java/examples/MyAuthedSocket.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/MyAuthedSocket.java
View File

@ -16,7 +16,7 @@
// ======================================================================== // ========================================================================
// //
package examples; package org.eclipse.jetty.websocket.javax.server.examples;
import javax.websocket.OnMessage; import javax.websocket.OnMessage;
import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpoint;

11
jetty-websocket/javax-websocket-server/src/test/java/examples/StreamingEchoSocket.java → jetty-websocket/javax-websocket-server/src/test/java/org/eclipse/jetty/websocket/javax/server/examples/StreamingEchoSocket.java
View File

@ -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.OnMessage;
import javax.websocket.Session; import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint; import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.io.Reader; import org.eclipse.jetty.util.IO;
import java.io.Writer;
@ServerEndpoint("/echo") @ServerEndpoint("/echo")
public class StreamingEchoSocket public class StreamingEchoSocket