Bump Wildfly to v37

Dockerfile

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

README.md

@@ -1,5 +1,5 @@
 # workmap [![CI](https://github.com/JeffersonLab/workmap/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/workmap/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/workmap?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/workmap)
-A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for geographical work coordination at Jefferson Lab.
+A [Jakarta EE 10](https://en.wikipedia.org/wiki/Jakarta_EE) web application for geographical work coordination at Jefferson Lab.
 
 
 ![Screenshot](https://github.com/JeffersonLab/workmap/raw/main/Screenshot.png?raw=true "Screenshot")
@@ -39,10 +39,10 @@ http://localhost:8080/workmap
 **See**: [Docker Compose Strategy](https://gist.github.com/slominskir/a7da801e8259f5974c978f9c3091d52c)
 
 ## Install
-This application requires a Java 17+ JVM and standard library to run, plus a Java EE 8+ application server (developed with Wildfly).
+This application requires a Java 17+ JVM and standard library to run, plus a Jakarta EE 10 application server (developed with Wildfly).
 
 1. Install service [dependencies](https://github.com/JeffersonLab/workmap/blob/main/deps.yaml)
-2. Download [Wildfly 26.1.3](https://www.wildfly.org/downloads/)
+2. Download [Wildfly 37.0.1](https://www.wildfly.org/downloads/)
 3. [Configure](https://github.com/JeffersonLab/workmap#configure) Wildfly and start it
 4. Download [workmap.war](https://github.com/JeffersonLab/workmap/releases) and deploy it to Wildfly
 5. Navigate your web browser to [localhost:8080/workmap](http://localhost:8080/workmap)
@@ -104,13 +104,13 @@ The [server](https://github.com/JeffersonLab/wildfly/blob/main/scripts/server-se
 ## Deploy
 The deploy to JLab's acctest is handled automatically via the release workflow.
 
-At JLab this app is found at [ace.jlab.org/workmap](https://ace.jlab.org/workmap) and internally at [acctest.acc.jlab.org/workmap](https://acctest.acc.jlab.org/workmap).  However, those servers are proxies for `wildfly6.acc.jlab.org` and `wildflytest6.acc.jlab.org` respectively.   A [deploy script](https://github.com/JeffersonLab/wildfly/blob/main/scripts/deploy.sh) is provided to automate wget and deploy.  Example:
+At JLab this app is found at [ace.jlab.org/workmap](https://ace.jlab.org/workmap) and internally at [acctest.acc.jlab.org/workmap](https://acctest.acc.jlab.org/workmap).  However, those servers are proxies for `wildfly5.acc.jlab.org` and `wildflytest5.acc.jlab.org` respectively.   A [deploy script](https://github.com/JeffersonLab/wildfly/blob/main/scripts/deploy.sh) is provided to automate wget and deploy.  Example:
 
 ```
-/root/setup/deploy.sh workmap v1.2.3
+/opt/wildfly/cd/deploy.sh workmap v1.2.3
 ```
 
-**JLab Internal Docs**:  [InstallGuideWildflyRHEL9](https://accwiki.acc.jlab.org/do/view/SysAdmin/InstallGuideWildflyRHEL9)
+**JLab Internal Docs**: [RHEL9 Wildfly](https://acgdocs.acc.jlab.org/en/ace/builds/rhel9-wildfly)
 
 ## See Also
  - [JLab ACE management-app list](https://github.com/search?q=org%3Ajeffersonlab+topic%3Aace+topic%3Amanagement-app&type=repositories)

build.gradle

@@ -18,12 +18,12 @@ repositories {
 }
 dependencies {
     // Setup should install these into Wildfly
-    providedCompile 'org.tuckey:urlrewritefilter:4.0.4'
+    providedCompile 'org.tuckey:urlrewritefilter:5.1.3'
 
-    // 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'
+    // Wildfly 37.0.1.Final provides:
+    providedCompile 'jakarta.platform:jakarta.jakartaee-api:10.0.0',
+            'org.hibernate:hibernate-core:6.6.19.Final',
+            'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1'
 }
 tasks.named('jar') {
     enabled = false

container/app/app-setup.env

@@ -8,5 +8,6 @@ ORACLE_PASS=password
 ORACLE_SERVER=oracle:1521
 ORACLE_SERVICE=xepdb1
 ORACLE_USER=WORKMAP_OWNER
+WILDFLY_RUN_USER=jboss
 WILDFLY_APP_HOME=/opt/jboss/wildfly
 

src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.atlis.workmap.business.session;
 
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import java.util.List;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
 /**
  * @author ryans

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java

@@ -1,15 +1,15 @@
 package org.jlab.atlis.workmap.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.util.Date;
 import java.util.List;
-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.atlis.workmap.persistence.entity.WorkMap;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.atlis.workmap.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.atlis.workmap.persistence.entity.WorkMapPssArea;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java

@@ -1,17 +1,17 @@
 package org.jlab.atlis.workmap.business.session;
 
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
 import org.jlab.atlis.workmap.persistence.entity.WorkMapPss;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.atlis.workmap.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.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.atlis.workmap.persistence.entity.WorkMapPssState;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java

@@ -1,8 +1,8 @@
 package org.jlab.atlis.workmap.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.atlis.workmap.persistence.entity.WorkMapTaskArea;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java

@@ -1,17 +1,17 @@
 package org.jlab.atlis.workmap.business.session;
 
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.PermitAll;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.ejb.Stateless;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.PermitAll;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
 import org.jlab.atlis.workmap.persistence.entity.WorkMapTask;
 
 /**

src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java

@@ -1,13 +1,13 @@
 package org.jlab.atlis.workmap.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.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.security.PermitAll;
-import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 import org.jlab.atlis.workmap.persistence.entity.WorkMapTaskType;
 
 /**

src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java

@@ -1,28 +1,28 @@
 package org.jlab.atlis.workmap.persistence.entity;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 /**
  * @author ryans

src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java

@@ -1,22 +1,22 @@
 package org.jlab.atlis.workmap.persistence.entity;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
 
 /**
  * @author ryans

src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java

@@ -1,24 +1,24 @@
 package org.jlab.atlis.workmap.persistence.entity;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 /**
  * @author ryans

src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java

@@ -1,23 +1,23 @@
 package org.jlab.atlis.workmap.persistence.entity;
 
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 /**
  * @author ryans