Rename websocket demos

* websocket-jakarta-api to ee10-websocket-jakarta-api * websocket-jetty-api to ee10-websocket-jetty-api
jetty · Feb 2, 2024 · c3ae5f1 · c3ae5f1
1 parent 396a022
commit c3ae5f1
Show file tree

Hide file tree

Showing 26 changed files with 19 additions and 40 deletions.
diff --git a/embedded/websocket-jakarta-api/pom.xml → embedded/ee10-websocket-jakarta-api/pom.xml b/embedded/websocket-jakarta-api/pom.xml → embedded/ee10-websocket-jakarta-api/pom.xml
@@ -6,10 +6,10 @@
     <artifactId>jetty-embedded-examples</artifactId>
     <version>12.0.x</version>
   </parent>
-  <artifactId>websocket-jakarta-api</artifactId>
+  <artifactId>ee10-websocket-jakarta-api</artifactId>
   <version>12.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: WebSocket with Jakarta EE API</name>
+  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: EE10 WebSocket with Jakarta EE API</name>
 
   <dependencies>
     <dependency>

diff --git a/.../examples/JakartaBrowserConfigurator.java → .../examples/JakartaBrowserConfigurator.java b/.../examples/JakartaBrowserConfigurator.java → .../examples/JakartaBrowserConfigurator.java
@@ -15,6 +15,7 @@
 
 import java.util.Collections;
 import java.util.List;
+
 import jakarta.websocket.Extension;
 import jakarta.websocket.HandshakeResponse;
 import jakarta.websocket.server.HandshakeRequest;

diff --git a/...ain/java/examples/JakartaBrowserMain.java → ...ain/java/examples/JakartaBrowserMain.java b/...ain/java/examples/JakartaBrowserMain.java → ...ain/java/examples/JakartaBrowserMain.java
@@ -18,20 +18,20 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import org.eclipse.jetty.ee10.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.ee10.servlet.DefaultServlet;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.resource.Resources;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...n/java/examples/JakartaBrowserSocket.java → ...n/java/examples/JakartaBrowserSocket.java b/...n/java/examples/JakartaBrowserSocket.java → ...n/java/examples/JakartaBrowserSocket.java
@@ -18,14 +18,14 @@
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Random;
+
 import jakarta.websocket.CloseReason;
 import jakarta.websocket.OnClose;
 import jakarta.websocket.OnMessage;
 import jakarta.websocket.OnOpen;
 import jakarta.websocket.RemoteEndpoint.Async;
 import jakarta.websocket.Session;
 import jakarta.websocket.server.ServerEndpoint;
-
 import org.eclipse.jetty.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...karta-api/src/main/resources/ssl/keystore → ...karta-api/src/main/resources/ssl/keystore b/...karta-api/src/main/resources/ssl/keystore → ...karta-api/src/main/resources/ssl/keystore
diff --git a/...in/resources/websocket-statics/index.html → ...in/resources/websocket-statics/index.html b/...in/resources/websocket-statics/index.html → ...in/resources/websocket-statics/index.html
diff --git a/...main/resources/websocket-statics/main.css → ...main/resources/websocket-statics/main.css b/...main/resources/websocket-statics/main.css → ...main/resources/websocket-statics/main.css
diff --git a/.../resources/websocket-statics/websocket.js → .../resources/websocket-statics/websocket.js b/.../resources/websocket-statics/websocket.js → .../resources/websocket-statics/websocket.js
diff --git a/embedded/websocket-jetty-api/pom.xml → embedded/ee10-websocket-jetty-api/pom.xml b/embedded/websocket-jetty-api/pom.xml → embedded/ee10-websocket-jetty-api/pom.xml
@@ -6,10 +6,10 @@
     <artifactId>jetty-embedded-examples</artifactId>
     <version>12.0.x</version>
   </parent>
-  <artifactId>websocket-jetty-api</artifactId>
+  <artifactId>ee10-websocket-jetty-api</artifactId>
   <version>12.0.x</version>
   <packaging>jar</packaging>
-  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: WebSocket with Jetty API</name>
+  <name>Jetty Examples :: Jetty 12.0.x :: Embedded :: EE10 WebSocket with Jetty API</name>
 
   <dependencies>
     <dependency>

diff --git a/...c/main/java/examples/JettyTimeSocket.java → ...c/main/java/examples/JettyTimeSocket.java b/...c/main/java/examples/JettyTimeSocket.java → ...c/main/java/examples/JettyTimeSocket.java
diff --git a/.../java/examples/SecureWebSocketServer.java → .../java/examples/SecureWebSocketServer.java b/.../java/examples/SecureWebSocketServer.java → .../java/examples/SecureWebSocketServer.java
@@ -13,22 +13,19 @@
 
 package examples;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServlet;
+import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServletFactory;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.util.resource.Resources;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServlet;
-import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServletFactory;
 import org.eclipse.jetty.websocket.api.Callback;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;

diff --git a/...i/src/main/java/examples/TimeServlet.java → ...i/src/main/java/examples/TimeServlet.java b/...i/src/main/java/examples/TimeServlet.java → ...i/src/main/java/examples/TimeServlet.java
@@ -18,7 +18,7 @@
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.TimeZone;
-import jakarta.servlet.ServletException;
+
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

diff --git a/...va/examples/WebSocketServerViaFilter.java → ...va/examples/WebSocketServerViaFilter.java b/...va/examples/WebSocketServerViaFilter.java → ...va/examples/WebSocketServerViaFilter.java
@@ -19,16 +19,15 @@
 import java.net.URL;
 import java.time.Duration;
 
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.ee10.servlet.DefaultServlet;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.ee10.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.ee10.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator;
 import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 
 public class WebSocketServerViaFilter

diff --git a/...jetty-api/src/main/resources/ssl/keystore → ...jetty-api/src/main/resources/ssl/keystore b/...jetty-api/src/main/resources/ssl/keystore → ...jetty-api/src/main/resources/ssl/keystore
diff --git a/...c/main/resources/static-root/css/main.css → ...c/main/resources/static-root/css/main.css b/...c/main/resources/static-root/css/main.css → ...c/main/resources/static-root/css/main.css
diff --git a/...src/main/resources/static-root/hello.html → ...src/main/resources/static-root/hello.html b/...src/main/resources/static-root/hello.html → ...src/main/resources/static-root/hello.html
diff --git a/...urces/static-root/images/jetty-avatar.png → ...urces/static-root/images/jetty-avatar.png b/...urces/static-root/images/jetty-avatar.png → ...urces/static-root/images/jetty-avatar.png
diff --git a/...urces/static-root/images/jetty-avatar.svg → ...urces/static-root/images/jetty-avatar.svg b/...urces/static-root/images/jetty-avatar.svg → ...urces/static-root/images/jetty-avatar.svg
diff --git a/...sources/static-root/images/jetty-logo.png → ...sources/static-root/images/jetty-logo.png b/...sources/static-root/images/jetty-logo.png → ...sources/static-root/images/jetty-logo.png
diff --git a/...src/main/resources/static-root/index.html → ...src/main/resources/static-root/index.html b/...src/main/resources/static-root/index.html → ...src/main/resources/static-root/index.html
diff --git a/.../resources/static-root/js/jquery-2.1.4.js → .../resources/static-root/js/jquery-2.1.4.js b/.../resources/static-root/js/jquery-2.1.4.js → .../resources/static-root/js/jquery-2.1.4.js
diff --git a/...sources/static-root/js/jquery-2.1.4.js.gz → ...sources/static-root/js/jquery-2.1.4.js.gz b/...sources/static-root/js/jquery-2.1.4.js.gz → ...sources/static-root/js/jquery-2.1.4.js.gz
diff --git a/.../resources/static-root/js/jquery.timer.js → .../resources/static-root/js/jquery.timer.js b/.../resources/static-root/js/jquery.timer.js → .../resources/static-root/js/jquery.timer.js
diff --git a/...sources/static-root/js/jquery.timer.js.gz → ...sources/static-root/js/jquery.timer.js.gz b/...sources/static-root/js/jquery.timer.js.gz → ...sources/static-root/js/jquery.timer.js.gz
diff --git a/...src/main/resources/static-root/js/time.js → ...src/main/resources/static-root/js/time.js b/...src/main/resources/static-root/js/time.js → ...src/main/resources/static-root/js/time.js
diff --git a/embedded/pom.xml b/embedded/pom.xml
@@ -23,6 +23,8 @@
     <module>ee10-servlet-config</module>
     <module>ee10-servlet-security</module>
     <module>ee10-webapp-context</module>
+    <module>ee10-websocket-jakarta-api</module>
+    <module>ee10-websocket-jetty-api</module>
     <module>error-handling</module>
     <module>file-server</module>
     <module>file-upload</module>
@@ -33,8 +35,6 @@
     <module>rewrite</module>
     <module>simple-server</module>
     <module>virtual-hosts</module>
-    <module>websocket-jakarta-api</module>
-    <module>websocket-jetty-api</module>
     <module>xml</module>
   </modules>