Bump Wildfly to v37

Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILD_IMAGE=gradle:9-jdk21
-ARG RUN_IMAGE=jeffersonlab/wildfly:1.0.0
+ARG RUN_IMAGE=jeffersonlab/wildfly:2.2.0
 
 ################## Stage 0
 FROM ${BUILD_IMAGE} AS builder

build.gradle

@@ -22,15 +22,17 @@ dependencies {
     implementation 'org.apache.httpcomponents:httpmime:4.5.14'
 
     // Setup should install these into Wildfly
-    providedCompile 'org.tuckey:urlrewritefilter:4.0.4',
-                    'org.jlab:jlog:5.0.0'
+    providedCompile 'org.tuckey:urlrewritefilter:5.1.3',
+                    'org.jlab:jlog:5.2.0'
 
-    // Wildfly 26.1.3.Final provides:
-    providedCompile 'javax:javaee-api:8.0.1',
-                    'javax.servlet:jstl:1.2',
-                    'org.hibernate:hibernate-core:5.3.28.Final',
-                    'org.hibernate:hibernate-envers:5.3.28.Final',
-                    'org.jsoup:jsoup:1.14.2'
+    // Wildfly 37.0.1.Final provides:
+    providedCompile 'jakarta.platform:jakarta.jakartaee-api:10.0.0',
+            'org.hibernate:hibernate-core:6.6.19.Final',
+            'org.hibernate:hibernate-envers:6.6.19.Final',
+            'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1'
+
+    // Latest Wildfly no longer includes...
+    implementation 'org.jsoup:jsoup:1.21.2'
 }
 tasks.named('jar') {
     enabled = false

deps.yaml

@@ -13,23 +13,18 @@ services:
       - ./container/oracle/initdb.d:/container-entrypoint-initdb.d
 
   keycloak:
-    image: jeffersonlab/keycloak:1.1.1
+    image: jeffersonlab/keycloak:2.1.0
     hostname: keycloak
     container_name: keycloak
     ports:
       - "8081:8080"
       - "9991:9990"
     environment:
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: admin
-      KEYCLOAK_FRONTEND_HOSTNAME: 'localhost'
-      KEYCLOAK_FRONTEND_PORT: '8081'
-      KEYCLOAK_SERVER_URL: 'http://keycloak:8080'
-      KEYCLOAK_HOME: '/opt/keycloak'
-      KEYCLOAK_REALM: 'test-realm'
-      KEYCLOAK_RESOURCE: 'presenter'
-      KEYCLOAK_SECRET: 'yHi6W2raPmLvPXoxqMA7VWbLAA2WN0eB'
-      TZ: 'America/New_York'
+      KC_FRONTEND_URL: 'http://localhost:8081/auth'
+      KC_BACKEND_URL: 'http://keycloak:8080/auth'
+      KC_HTTP_RELATIVE_PATH: '/auth'
+      KC_BOOTSTRAP_ADMIN_USERNAME: 'admin'
+      KC_BOOTSTRAP_ADMIN_PASSWORD: 'admin'
     volumes:
       - ./container/keycloak/initdb.d:/container-entrypoint-initdb.d
 

src/main/java/org/jlab/presenter/business/exception/WebAppException.java

@@ -1,6 +1,6 @@
 package org.jlab.presenter.business.exception;
 
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
 
 /**
  * @author ryans

src/main/java/org/jlab/presenter/business/session/AbstractFacade.java

@@ -1,12 +1,12 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import java.util.List;
-import javax.annotation.security.PermitAll;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
 /**
  * @author ryans

src/main/java/org/jlab/presenter/business/session/AccActivityRecordFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.AccActivityRecord;
 
 /**

src/main/java/org/jlab/presenter/business/session/AccessRecordFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.AccessRecord;
 
 /**

src/main/java/org/jlab/presenter/business/session/BeamToHallRecordFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.BeamToHallRecord;
 
 /**

src/main/java/org/jlab/presenter/business/session/BodySlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.BodySlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/BtaRecordFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.BtaRecord;
 
 /**

src/main/java/org/jlab/presenter/business/session/BtaShiftInfoSlideFacade.java

@@ -1,11 +1,11 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 import java.math.BigInteger;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import org.jlab.presenter.persistence.entity.BtaShiftInfoSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/CCPresentationFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.presenter.persistence.entity.CCPresentation;
 import org.jlab.presenter.persistence.enumeration.Shift;
 

src/main/java/org/jlab/presenter/business/session/DailyScheduledLogger.java

@@ -1,19 +1,19 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+import jakarta.ejb.ScheduleExpression;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.ScheduleExpression;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
 import org.jlab.presenter.business.util.IOUtil;
 import org.jlab.presenter.business.util.TimeUtil;
 import org.jlab.presenter.business.util.UrlUtil;

src/main/java/org/jlab/presenter/business/session/IFrameSlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.IFrameSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/ImageSlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.ImageSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/LASOPresentationFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.presenter.persistence.entity.LASOPresentation;
 import org.jlab.presenter.persistence.enumeration.Shift;
 

src/main/java/org/jlab/presenter/business/session/LOPresentationFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.presenter.persistence.entity.LOPresentation;
 import org.jlab.presenter.persistence.enumeration.Shift;
 

src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java

@@ -1,15 +1,15 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.TypedQuery;
 import java.math.BigInteger;
 import java.util.*;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.presenter.business.exception.WebAppException;
 import org.jlab.presenter.business.util.TimeUtil;
 import org.jlab.presenter.persistence.entity.*;
@@ -246,7 +246,7 @@ public List<Slide> getIncomingSlides(
   public List<PDPresentation> findRecent() {
     TypedQuery<PDPresentation> q =
         em.createQuery(
-            "select p from PDPresentation p where p.deliveryYmd > sysdate - 8 order by p.deliveryYmd desc, p.pdPresentationType desc",
+            "select p from PDPresentation p where p.deliveryYmd > (current_timestamp - 8 day) order by p.deliveryYmd desc, p.pdPresentationType desc",
             PDPresentation.class);
 
     return q.getResultList();

src/main/java/org/jlab/presenter/business/session/PdAccessSlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.PdAccessSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/PdBeamAccSlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.PdBeamAccSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/PdInfoSlideFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.presenter.business.session;
 
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import org.jlab.presenter.persistence.entity.PdInfoSlide;
 
 /**

src/main/java/org/jlab/presenter/business/session/PresentationFacade.java

@@ -1,5 +1,21 @@
 package org.jlab.presenter.business.session;
 
+import jakarta.annotation.Resource;
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBAccessException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -12,22 +28,6 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Resource;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.PermitAll;
-import javax.ejb.EJB;
-import javax.ejb.EJBAccessException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.jlog.Body.ContentType;
 import org.jlab.jlog.Library;
 import org.jlab.jlog.LogEntry;