diff --git a/Dockerfile b/Dockerfile index b3a6c46..6534a7b 100644 --- a/Dockerfile +++ b/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 diff --git a/README.md b/README.md index 9f5d2c6..1a66925 100644 --- a/README.md +++ b/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) diff --git a/build.gradle b/build.gradle index 72f3f46..751c96e 100644 --- a/build.gradle +++ b/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 diff --git a/container/app/app-setup.env b/container/app/app-setup.env index 537f3f4..29a36f9 100644 --- a/container/app/app-setup.env +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java index 2fab576..9b6df03 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/AbstractFacade.java +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java index 84493a7..54c60db 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java index 99aca83..8ff8657 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssAreaFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java index 27ede15..d531b30 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java index 23094d8..ca61593 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapPssStateFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java index 086b263..0c6262e 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskAreaFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java index a6d883a..3e9140e 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java b/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java index ecc4faf..f35657b 100644 --- a/src/main/java/org/jlab/atlis/workmap/business/session/WorkMapTaskTypeFacade.java +++ b/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; /** diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java index dc0b067..fb20cb6 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMap.java +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java index 8034cfa..c08bdeb 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPss.java +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java index d075875..fd650e9 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssArea.java +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java index 6fd70fe..affc4e1 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapPssState.java +++ b/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 diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java index d770d34..7ef4611 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTask.java @@ -1,24 +1,24 @@ 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 jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlRootElement; 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; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlRootElement; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java index 78224c5..63f5951 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskArea.java @@ -1,23 +1,23 @@ 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.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.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 diff --git a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java index c795c58..6931df0 100644 --- a/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.java +++ b/src/main/java/org/jlab/atlis/workmap/persistence/entity/WorkMapTaskType.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.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.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 diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java index 0fdc4bf..f40f0f1 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Convert.java @@ -1,5 +1,10 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,11 +14,6 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * Servlet controller for proxying requests to Puppet Show to allow HTML conversion even for diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java index e2491d4..95f1cf4 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/CopyWorkMap.java @@ -1,15 +1,15 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.ejb.EJB; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; -import javax.ejb.EJB; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.business.session.WorkMapFacade; import org.jlab.atlis.workmap.presentation.util.WorkmapUtil; diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java index ae6580c..d943756 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/EditWorkMap.java @@ -1,16 +1,16 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.ejb.EJB; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import javax.ejb.EJB; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.business.session.WorkMapFacade; import org.jlab.atlis.workmap.persistence.entity.WorkMap; import org.jlab.atlis.workmap.persistence.entity.WorkMapPss; diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java index 21198a9..420492d 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Error.java @@ -1,12 +1,12 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.ejb.EJBAccessException; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.ejb.EJBAccessException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.presentation.exception.WorkMapException; /** @@ -28,10 +28,10 @@ public class Error extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception"); - Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); - String servletName = (String) request.getAttribute("javax.servlet.error.servlet_name"); - String requestUri = (String) request.getAttribute("javax.servlet.error.request_uri"); + Throwable throwable = (Throwable) request.getAttribute("jakarta.servlet.error.exception"); + Integer statusCode = (Integer) request.getAttribute("jakarta.servlet.error.status_code"); + String servletName = (String) request.getAttribute("jakarta.servlet.error.servlet_name"); + String requestUri = (String) request.getAttribute("jakarta.servlet.error.request_uri"); String message = "An unknown error has occurred."; diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java index fc03266..cc2dca1 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/Logout.java @@ -1,11 +1,11 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java index cd0ece3..881598c 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/SSORedirect.java @@ -1,11 +1,11 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java b/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java index 800393b..447a2ea 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/controller/ViewWorkMap.java @@ -1,12 +1,12 @@ package org.jlab.atlis.workmap.presentation.controller; +import jakarta.inject.Inject; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.inject.Inject; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.presentation.util.WorkmapUtil; @WebServlet( diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java b/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java index 66a8167..ae2261f 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/exception/WorkMapException.java @@ -1,6 +1,6 @@ package org.jlab.atlis.workmap.presentation.exception; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java index 1a6edd1..e640e87 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CacheFilter.java @@ -1,17 +1,17 @@ package org.jlab.atlis.workmap.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.util.Arrays; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java index cd34300..8701401 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/CharacterEncodingFilter.java @@ -1,14 +1,14 @@ package org.jlab.atlis.workmap.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; import java.io.IOException; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java index a0093d9..70ab828 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/LocaleFilter.java @@ -1,16 +1,16 @@ package org.jlab.atlis.workmap.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.jsp.jstl.core.Config; import java.io.IOException; import java.util.Locale; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.jsp.jstl.core.Config; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java b/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java index 541503f..8f8f569 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/filter/PublicProxyFilter.java @@ -1,11 +1,11 @@ package org.jlab.atlis.workmap.presentation.filter; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.logging.Logger; -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author ryans diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java b/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java index b6046a8..2ddfe56 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/util/ConfigurationParameterInit.java @@ -1,11 +1,11 @@ package org.jlab.atlis.workmap.presentation.util; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; @WebListener public class ConfigurationParameterInit implements ServletContextListener { diff --git a/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java b/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java index dcdaacd..200bed7 100644 --- a/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java +++ b/src/main/java/org/jlab/atlis/workmap/presentation/util/WorkmapUtil.java @@ -1,5 +1,12 @@ package org.jlab.atlis.workmap.presentation.util; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -7,13 +14,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.atlis.workmap.business.session.WorkMapFacade; import org.jlab.atlis.workmap.business.session.WorkMapPssAreaFacade; import org.jlab.atlis.workmap.business.session.WorkMapPssFacade; diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 8e2f97f..3751cf1 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -8,7 +8,6 @@ false - diff --git a/src/main/webapp/WEB-INF/fragments/auth.jspf b/src/main/webapp/WEB-INF/fragments/auth.jspf index 28e7139..7968ae0 100644 --- a/src/main/webapp/WEB-INF/fragments/auth.jspf +++ b/src/main/webapp/WEB-INF/fragments/auth.jspf @@ -1,5 +1,5 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%>
@@ -16,7 +16,7 @@ - + diff --git a/src/main/webapp/WEB-INF/fragments/map-dialogs.jspf b/src/main/webapp/WEB-INF/fragments/map-dialogs.jspf index 53aa725..f87a677 100644 --- a/src/main/webapp/WEB-INF/fragments/map-dialogs.jspf +++ b/src/main/webapp/WEB-INF/fragments/map-dialogs.jspf @@ -1,5 +1,5 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%>
diff --git a/src/main/webapp/WEB-INF/fragments/nav-dialogs.jspf b/src/main/webapp/WEB-INF/fragments/nav-dialogs.jspf index aedbdfa..37da507 100644 --- a/src/main/webapp/WEB-INF/fragments/nav-dialogs.jspf +++ b/src/main/webapp/WEB-INF/fragments/nav-dialogs.jspf @@ -1,5 +1,5 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%>