Jetty 12 - Re-enable some disabled session tests.

jetty-ee10/test-ee10-sessions/test-ee10-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java

@@ -44,7 +44,6 @@
  * ReloadedSessionMissingClassTest
  */
 //TODO
-@Disabled
 @ExtendWith(WorkDirExtension.class)
 @Testcontainers(disabledWithoutDocker = true)
 public class ReloadedSessionMissingClassTest

jetty-ee10/test-ee10-sessions/test-ee10-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java

@@ -23,7 +23,6 @@
  * WebAppObjectInSessionTest
  */
 //TODO
-@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class WebAppObjectInSessionTest extends AbstractWebAppObjectInSessionTest
 {

jetty-ee10/test-ee10-sessions/test-ee10-sessions-common/src/main/java/org/eclipse/jetty/ee10/session/AbstractWebAppObjectInSessionTest.java

@@ -16,6 +16,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
+import java.net.URL;
 
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.client.HttpClient;
@@ -74,22 +75,22 @@ public void testWebappObjectInSession() throws Exception
         w.close();
         File classesDir = new File(webInfDir, "classes");
         classesDir.mkdir();
-        String packageName = WebAppObjectInSessionServlet.class.getPackage().getName();
-        File packageDirs = new File(classesDir, packageName.replace('.', File.separatorChar));
+        String packageName = File.separator + WebAppObjectInSessionServlet.class.getPackage().getName().replace('.', File.separatorChar) + File.separator;
+        File packageDirs = new File(classesDir, packageName);
         packageDirs.mkdirs();
 
         try (ResourceFactory.Closeable resourceFactory = ResourceFactory.closeable())
         {
             String resourceName = WebAppObjectInSessionServlet.class.getSimpleName() + ".class";
-            Resource resource = resourceFactory.newResource(getClass().getResource(resourceName));
+            Resource resource = resourceFactory.newResource(getClass().getResource(packageName + resourceName));
 
             //File sourceFile = new File(getClass().getClassLoader().getResource(resourceName).toURI());
             File targetFile = new File(packageDirs, resourceName);
             //copy(sourceFile, targetFile);
             IO.copy(resource.newInputStream(), new FileOutputStream(targetFile));
 
             resourceName = WebAppObjectInSessionServlet.class.getSimpleName() + "$" + WebAppObjectInSessionServlet.TestSharedStatic.class.getSimpleName() + ".class";
-            resource = resourceFactory.newResource(getClass().getResource(resourceName));
+            resource = resourceFactory.newResource(getClass().getResource(packageName + resourceName));
             //sourceFile = new File(getClass().getClassLoader().getResource(resourceName).toURI());
             targetFile = new File(packageDirs, resourceName);
             //copy(sourceFile, targetFile);

jetty-ee10/test-ee10-sessions/test-ee10-sessions-common/src/main/java/org/eclipse/jetty/ee10/session/SessionTestSupport.java

@@ -136,8 +136,14 @@ public void stop() throws Exception
 
     public WebAppContext addWebAppContext(String warPath, String contextPath) throws Exception
     {
-        //TODO
-        throw new UnsupportedOperationException("TODO!");
+        WebAppContext context = new WebAppContext(warPath, contextPath);
+        SessionHandler sessionHandler = newSessionHandler();
+        sessionHandler.setSessionIdManager(_sessionIdManager);
+        sessionHandler.setMaxInactiveInterval(_maxInactivePeriod);
+        context.setSessionHandler(sessionHandler);
+        _contexts.addHandler(context);
+
+        return context; 
     }
 
     public Server getServer()

jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/src/test/resources/jetty-logging.properties

@@ -0,0 +1,2 @@
+# Jetty Logging using jetty-slf4j-impl
+#org.eclipse.jetty.LEVEL=DEBUG

jetty-ee8/test-ee8-sessions/test-ee8-jdbc-sessions/src/test/resources/simplelogger.properties

@@ -0,0 +1,3 @@
+org.slf4j.simpleLogger.defaultLogLevel=info
+org.slf4j.simpleLogger.log.org.eclipse.jetty.session.MariaDbLogs=error
+org.slf4j.simpleLogger.log.org.eclipse.jetty.session.JdbcTestHelper=info

jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/ReloadedSessionMissingClassTest.java

@@ -43,8 +43,6 @@
 /**
  * ReloadedSessionMissingClassTest
  */
-//TODO
-@Disabled
 @ExtendWith(WorkDirExtension.class)
 @Testcontainers(disabledWithoutDocker = true)
 public class ReloadedSessionMissingClassTest
@@ -115,6 +113,7 @@ public void testSessionReloadWithMissingClass() throws Exception
                 assertNotNull(sessionId);
 
                 //Stop the webapp
+                webApp.get().stop();
                 webApp.stop();
 
                 webApp.setClassLoader(loaderWithoutFoo);

jetty-ee9/test-ee9-sessions/test-ee9-jdbc-sessions/src/test/java/org/eclipse/jetty/session/WebAppObjectInSessionTest.java

@@ -22,8 +22,6 @@
 /**
  * WebAppObjectInSessionTest
  */
-//TODO
-@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class WebAppObjectInSessionTest extends AbstractWebAppObjectInSessionTest
 {

jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/ee9/session/AbstractWebAppObjectInSessionTest.java

@@ -74,22 +74,22 @@ public void testWebappObjectInSession() throws Exception
         w.close();
         File classesDir = new File(webInfDir, "classes");
         classesDir.mkdir();
-        String packageName = WebAppObjectInSessionServlet.class.getPackage().getName();
-        File packageDirs = new File(classesDir, packageName.replace('.', File.separatorChar));
+        String packageName = File.separator + WebAppObjectInSessionServlet.class.getPackage().getName().replace('.', File.separatorChar) + File.separator;
+        File packageDirs = new File(classesDir, packageName);
         packageDirs.mkdirs();
 
         try (ResourceFactory.Closeable resourceFactory = ResourceFactory.closeable())
         {
             String resourceName = WebAppObjectInSessionServlet.class.getSimpleName() + ".class";
-            Resource resource = resourceFactory.newResource(getClass().getResource(resourceName));
+            Resource resource = resourceFactory.newResource(getClass().getResource(packageName + resourceName));
 
             //File sourceFile = new File(getClass().getClassLoader().getResource(resourceName).toURI());
             File targetFile = new File(packageDirs, resourceName);
             //copy(sourceFile, targetFile);
             IO.copy(resource.newInputStream(), new FileOutputStream(targetFile));
 
             resourceName = WebAppObjectInSessionServlet.class.getSimpleName() + "$" + WebAppObjectInSessionServlet.TestSharedStatic.class.getSimpleName() + ".class";
-            resource = resourceFactory.newResource(getClass().getResource(resourceName));
+            resource = resourceFactory.newResource(getClass().getResource(packageName + resourceName));
             //sourceFile = new File(getClass().getClassLoader().getResource(resourceName).toURI());
             targetFile = new File(packageDirs, resourceName);
             //copy(sourceFile, targetFile);

jetty-ee9/test-ee9-sessions/test-ee9-sessions-common/src/main/java/org/eclipse/jetty/ee9/session/SessionTestSupport.java

@@ -136,8 +136,14 @@ public void stop() throws Exception
 
     public WebAppContext addWebAppContext(String warPath, String contextPath) throws Exception
     {
-        //TODO
-        throw new UnsupportedOperationException("TODO!");
+        WebAppContext context = new WebAppContext(warPath, contextPath);
+        SessionHandler sessionHandler = newSessionHandler();
+        sessionHandler.getSessionManager().setSessionIdManager(_sessionIdManager);
+        sessionHandler.setMaxInactiveInterval(_maxInactivePeriod);
+        context.setSessionHandler(sessionHandler);
+        _contexts.addHandler(context);
+
+        return context;
     }
 
     public Server getServer()