From 1bba7a11f11e28ce93c18803e1b6f4780ea7484e Mon Sep 17 00:00:00 2001
From: Claude Brisson <claude@renegat.net>
Date: Sat, 13 May 2023 08:28:28 +0200
Subject: [PATCH] Jetty embedding in progress

---
 .gitignore                                    |  4 ++++
 container/pom.xml                             | 19 ++++++++++++++-----
 .../pairgoth/container/ServerMain.java        |  9 ++++++++-
 .../main/resources/jetty-logging.properties   |  6 ------
 pom.xml                                       |  3 +--
 webapp/pom.xml                                |  2 +-
 .../org/jeudego/pairgoth/web/WebappManager.kt |  5 +++--
 7 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5d04db0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+target
+docker/data
+.idea
+docker/.env
diff --git a/container/pom.xml b/container/pom.xml
index 3bdf876..352b942 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -18,21 +18,30 @@
       <artifactId>jetty-webapp</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-annotations</artifactId>
       <version>${jetty.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-javax-server</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
+    -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jndi</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <!--
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>    
+    -->
   </dependencies>
   <build>
     <plugins>
diff --git a/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java b/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
index 4ff8536..84c5f2e 100644
--- a/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
+++ b/container/src/main/java/org/jeudego/pairgoth/container/ServerMain.java
@@ -21,6 +21,7 @@ package org.jeudego.pairgoth.container;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -54,7 +55,13 @@ public class ServerMain
     {
         Server server = new Server(8080);
 
-        WebAppContext context = new WebAppContext();
+        WebAppContext context = new WebAppContext() {
+            @Override
+            public boolean isServerResource(String name, URL url)
+            {
+                return super.isServerResource(name, url) || url.getFile().contains("/WEB-INF/jetty-server/");
+            }
+        };
         context.setContextPath("/");
 
         switch (getOperationalMode())
diff --git a/container/src/main/resources/jetty-logging.properties b/container/src/main/resources/jetty-logging.properties
index f82758f..d4922ad 100644
--- a/container/src/main/resources/jetty-logging.properties
+++ b/container/src/main/resources/jetty-logging.properties
@@ -1,8 +1,2 @@
 org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
 org.eclipse.jetty.LEVEL=INFO
-
-# Squelch noisy logging
-org.eclipse.jetty.websocket.jsr356.JsrBasicRemote.LEVEL=WARN
-
-# org.eclipse.jetty.annotations.LEVEL=DEBUG
-# org.eclipse.jetty.websocket.LEVEL=DEBUG
diff --git a/pom.xml b/pom.xml
index c20849e..ac18925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,8 @@
     <license.plugin.version>4.2</license.plugin.version>
 
     <servlet.api.version>4.0.4</servlet.api.version>
-    <websocket.api.version>1.1.2</websocket.api.version>
     <jetty.version>10.0.15</jetty.version>
-    <slf4j.version>2.0.0-alpha3</slf4j.version>
+    <slf4j.version>2.0.7</slf4j.version>
   </properties>
 
   <modules>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index e22c852..9b921be 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>com.republicate</groupId>
             <artifactId>webapp-slf4j-logger</artifactId>
-            <version>1.6</version>
+            <version>3.0</version>
             <scope>runtime</scope>
         </dependency>
         <!--
diff --git a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt
index 25bfe49..8e3d337 100644
--- a/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt
+++ b/webapp/src/main/kotlin/org/jeudego/pairgoth/web/WebappManager.kt
@@ -4,9 +4,11 @@ import com.republicate.mailer.SmtpLoop
 import org.apache.commons.lang3.tuple.Pair
 import org.slf4j.LoggerFactory
 import java.io.IOException
+import java.lang.IllegalAccessError
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
 import java.util.*
+import java.util.IllegalFormatCodePointException
 import javax.net.ssl.*
 import javax.servlet.*
 import javax.servlet.annotation.WebListener
@@ -48,8 +50,7 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H
 
     /* ServletContextListener interface */
     override fun contextInitialized(sce: ServletContextEvent) {
-        // overcome a Jetty's bug (v9.4.10.v20180503) whereas if a @WebListener is also listed in the descriptor
-        // it will be instanciated twice...
+        if (1==1) throw IllegalAccessError("sgdfgsdfg");
         context = sce.servletContext
         logger.info("---------- Starting Web Application ----------")
         context.setAttribute("manager", this)