diff --git a/Dockerfile b/Dockerfile index 10f9c932..9eee5bd4 100644 --- a/Dockerfile +++ b/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 diff --git a/README.md b/README.md index affc801a..76c2b132 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # jam [![CI](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/jam?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/jam) -A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template. +A [Jakarta EE 10](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template. ![Screenshot](https://github.com/JeffersonLab/jam/raw/main/Screenshot.png?raw=true "Screenshot") @@ -49,10 +49,10 @@ http://localhost:8080/jam **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/jam/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/jam#configure) Wildfly and start it 4. Download [jam.war](https://github.com/JeffersonLab/jam/releases) and deploy it to Wildfly 5. Navigate your web browser to [localhost:8080/jam](http://localhost:8080/jam) @@ -112,13 +112,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/jam](https://ace.jlab.org/jam) and internally at [acctest.acc.jlab.org/jam](https://acctest.acc.jlab.org/jam). 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 on each server to automate wget and deploy. Example: +At JLab this app is found at [ace.jlab.org/jam](https://ace.jlab.org/jam) and internally at [acctest.acc.jlab.org/jam](https://acctest.acc.jlab.org/jam). However, those servers are proxies for `wildfly3.acc.jlab.org` and `wildflytest3.acc.jlab.org` respectively. A [deploy script](https://github.com/JeffersonLab/wildfly/blob/main/scripts/deploy.sh) is provided on each server to automate wget and deploy. Example: ``` -/root/setup/deploy.sh jam v1.2.3 +/opt/wildfly/cd/deploy.sh jam 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 eac9a66d..4414b07a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ description = 'JLab authorization manager app' group = 'org.jlab' version = new File("${projectDir}/VERSION").text.trim() ext.version = project.version -ext.smoothnessVersion = '4.13.0' +ext.smoothnessVersion = '5.0.2' ext.releaseDate = new Date().format('MMM dd yyyy') tasks.withType(JavaCompile).configureEach { @@ -16,23 +16,19 @@ tasks.withType(JavaCompile).configureEach { } repositories { mavenCentral() - - maven { - url = "https://s01.oss.sonatype.org/content/repositories/releases/" - } } dependencies { // No matter what smoothness weblib MUST be included in WAR (https://github.com/JeffersonLab/smoothness/issues/4) implementation "org.jlab:smoothness-weblib:${smoothnessVersion}" // Smoothness setup should install these into Wildfly - providedCompile 'org.tuckey:urlrewritefilter:4.0.4', - 'org.jlab:jlog:5.1.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' + // 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 033c23b0..aee9a278 100644 --- a/container/app/app-setup.env +++ b/container/app/app-setup.env @@ -8,6 +8,7 @@ ORACLE_PASS=password ORACLE_SERVER=oracle:1521 ORACLE_SERVICE=xepdb1 ORACLE_USER=JAM_OWNER +WILDFLY_RUN_USER=jboss WILDFLY_APP_HOME=/opt/jboss/wildfly EMAIL_FROM=tester@example.com EMAIL_HOST=mailhog diff --git a/src/main/java/org/jlab/jam/business/session/AbstractFacade.java b/src/main/java/org/jlab/jam/business/session/AbstractFacade.java index d3aea761..15472a39 100644 --- a/src/main/java/org/jlab/jam/business/session/AbstractFacade.java +++ b/src/main/java/org/jlab/jam/business/session/AbstractFacade.java @@ -1,22 +1,22 @@ package org.jlab.jam.business.session; +import jakarta.annotation.Resource; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.SessionContext; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionAttributeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Root; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.annotation.Resource; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.ejb.EJBAccessException; -import javax.ejb.SessionContext; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Root; import org.jlab.jam.persistence.entity.VerificationTeam; import org.jlab.smoothness.business.service.UserAuthorizationService; import org.jlab.smoothness.persistence.view.User; diff --git a/src/main/java/org/jlab/jam/business/session/AuthorizerFacade.java b/src/main/java/org/jlab/jam/business/session/AuthorizerFacade.java index 904c495a..6b873877 100644 --- a/src/main/java/org/jlab/jam/business/session/AuthorizerFacade.java +++ b/src/main/java/org/jlab/jam/business/session/AuthorizerFacade.java @@ -1,16 +1,16 @@ package org.jlab.jam.business.session; +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 jakarta.persistence.criteria.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.Authorizer; import org.jlab.jam.persistence.entity.AuthorizerPK; import org.jlab.jam.persistence.entity.Facility; diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java index 8e05f0d0..5259fbd4 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java @@ -1,5 +1,13 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.Calendar; import java.util.Date; @@ -8,14 +16,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TypedQuery; import org.jlab.jam.business.util.EqualityHelper; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; diff --git a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java index a54ea084..95527ec6 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java @@ -1,18 +1,21 @@ package org.jlab.jam.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.Query; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.time.Period; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -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.Query; -import javax.persistence.TypedQuery; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.entity.BeamAuthorization; import org.jlab.jam.persistence.view.BeamExpirationEvent; @@ -344,12 +347,22 @@ public void insertExpiredHistory( @PermitAll public List checkForUpcomingVerificationExpirations( Facility facility, boolean boundary) { - String dateRangeConstraint = - "(sysdate) <= a.expirationDate and (sysdate + 7) > a.expirationDate"; + + LocalDateTime now = LocalDateTime.now(); + Period sevenDayPeriod = Period.ofDays(7); + Period sixDayPeriod = Period.ofDays(6); + LocalDateTime inFutureSevenDays = now.plus(sevenDayPeriod); + LocalDateTime inFutureSixDays = now.plus(sixDayPeriod); + + String dateRangeConstraint = ":beginRange <= a.expirationDate and :endRange > a.expirationDate"; + + LocalDateTime beginRange = now; + LocalDateTime endRange = inFutureSevenDays; if (boundary) { - dateRangeConstraint = - "(sysdate + 6) <= a.expirationDate and (sysdate + 7) > a.expirationDate"; + dateRangeConstraint = ":beginRange <= a.expirationDate and :endRange > a.expirationDate"; + + beginRange = inFutureSixDays; } TypedQuery q = @@ -360,6 +373,8 @@ public List checkForUpcomingVerificationExpirations( BeamControlVerification.class); q.setParameter("facility", facility); + q.setParameter("beginRange", Timestamp.valueOf(beginRange)); + q.setParameter("endRange", Timestamp.valueOf(endRange)); // sysdate >= (a.expirationDate - 7) and sysdate < (a.expirationDate - 6) // (sysdate + 6) <= a.expirationDate and (sysdate + 7) > a.expirationDate diff --git a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java index 317e73ca..dae005ec 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java @@ -1,12 +1,12 @@ package org.jlab.jam.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.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.jam.persistence.entity.BeamControlVerificationHistory; /** diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java index 812e99ed..47edaa98 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java @@ -1,8 +1,8 @@ package org.jlab.jam.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.jam.persistence.entity.BeamDestinationAuthorization; /** diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java index d8b2cf3f..83c78ff1 100644 --- a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java @@ -1,16 +1,16 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; 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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.*; /** diff --git a/src/main/java/org/jlab/jam/business/session/ComponentFacade.java b/src/main/java/org/jlab/jam/business/session/ComponentFacade.java index 530d1644..935829a5 100644 --- a/src/main/java/org/jlab/jam/business/session/ComponentFacade.java +++ b/src/main/java/org/jlab/jam/business/session/ComponentFacade.java @@ -1,12 +1,12 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.math.BigInteger; import java.util.*; -import javax.annotation.security.RolesAllowed; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import org.jlab.jam.persistence.entity.BeamControlVerification; import org.jlab.jam.persistence.entity.Component; import org.jlab.jam.persistence.entity.RFControlVerification; diff --git a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java index 634ca68e..a70511fe 100644 --- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java +++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java @@ -1,17 +1,17 @@ package org.jlab.jam.business.session; +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.TypedQuery; +import jakarta.persistence.criteria.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -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.TypedQuery; -import javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.CreditedControl; import org.jlab.jam.persistence.entity.Facility; import org.jlab.jam.persistence.entity.VerificationTeam; diff --git a/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java b/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java index 33f1e630..5d77aa96 100644 --- a/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java +++ b/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java @@ -1,19 +1,19 @@ package org.jlab.jam.business.session; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.annotation.security.RolesAllowed; +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.TimerConfig; +import jakarta.ejb.TimerService; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.annotation.security.RolesAllowed; -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.TimerConfig; -import javax.ejb.TimerService; import org.jlab.jam.persistence.entity.Facility; import org.jlab.jam.persistence.view.FacilityExpirationEvent; import org.jlab.jam.persistence.view.FacilityUpcomingExpiration; diff --git a/src/main/java/org/jlab/jam/business/session/EmailFacade.java b/src/main/java/org/jlab/jam/business/session/EmailFacade.java index e4a3b9c8..849fee25 100644 --- a/src/main/java/org/jlab/jam/business/session/EmailFacade.java +++ b/src/main/java/org/jlab/jam/business/session/EmailFacade.java @@ -1,22 +1,22 @@ package org.jlab.jam.business.session; +import jakarta.activation.DataHandler; +import jakarta.activation.DataSource; +import jakarta.activation.FileDataSource; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.mail.*; +import jakarta.mail.internet.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.io.File; import java.text.SimpleDateFormat; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.mail.*; -import javax.mail.internet.*; import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.persistence.view.*; diff --git a/src/main/java/org/jlab/jam/business/session/ExpirationManager.java b/src/main/java/org/jlab/jam/business/session/ExpirationManager.java index d41fbb39..dbdc7c26 100644 --- a/src/main/java/org/jlab/jam/business/session/ExpirationManager.java +++ b/src/main/java/org/jlab/jam/business/session/ExpirationManager.java @@ -1,12 +1,12 @@ package org.jlab.jam.business.session; +import jakarta.ejb.*; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import javax.ejb.*; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.view.BeamExpirationEvent; import org.jlab.jam.persistence.view.FacilityExpirationEvent; diff --git a/src/main/java/org/jlab/jam/business/session/FacilityFacade.java b/src/main/java/org/jlab/jam/business/session/FacilityFacade.java index 7c6118d7..dd051373 100644 --- a/src/main/java/org/jlab/jam/business/session/FacilityFacade.java +++ b/src/main/java/org/jlab/jam/business/session/FacilityFacade.java @@ -1,13 +1,13 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; import java.util.ArrayList; 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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.Facility; /** diff --git a/src/main/java/org/jlab/jam/business/session/LogbookFacade.java b/src/main/java/org/jlab/jam/business/session/LogbookFacade.java index a8c07e36..8cad7bbb 100644 --- a/src/main/java/org/jlab/jam/business/session/LogbookFacade.java +++ b/src/main/java/org/jlab/jam/business/session/LogbookFacade.java @@ -1,15 +1,15 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.io.*; import java.math.BigInteger; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import org.jlab.jam.persistence.entity.Facility; import org.jlab.jam.persistence.entity.VerificationTeam; import org.jlab.jam.persistence.enumeration.OperationsType; diff --git a/src/main/java/org/jlab/jam/business/session/NotificationManager.java b/src/main/java/org/jlab/jam/business/session/NotificationManager.java index be930fe4..02eed958 100644 --- a/src/main/java/org/jlab/jam/business/session/NotificationManager.java +++ b/src/main/java/org/jlab/jam/business/session/NotificationManager.java @@ -1,5 +1,9 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Asynchronous; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; import java.io.*; import java.math.BigInteger; import java.net.URL; @@ -10,10 +14,6 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.security.PermitAll; -import javax.ejb.Asynchronous; -import javax.ejb.EJB; -import javax.ejb.Stateless; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.persistence.view.FacilityExpirationEvent; diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java index 5271bdd2..f5f6c5b0 100644 --- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java @@ -1,18 +1,18 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import java.io.*; import java.math.BigInteger; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TypedQuery; import org.jlab.jam.business.util.EqualityHelper; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; diff --git a/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java b/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java index 941aad2a..133d0550 100644 --- a/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java @@ -1,18 +1,21 @@ package org.jlab.jam.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.Query; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.time.Period; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -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.Query; -import javax.persistence.TypedQuery; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.view.RFExpirationEvent; import org.jlab.smoothness.business.exception.UserFriendlyException; @@ -340,12 +343,22 @@ public void insertExpiredHistory( @PermitAll public List checkForUpcomingVerificationExpirations( Facility facility, boolean boundary) { - String dateRangeConstraint = - "(sysdate) <= a.expirationDate and (sysdate + 7) > a.expirationDate"; + + LocalDateTime now = LocalDateTime.now(); + Period sevenDayPeriod = Period.ofDays(7); + Period sixDayPeriod = Period.ofDays(6); + LocalDateTime inFutureSevenDays = now.plus(sevenDayPeriod); + LocalDateTime inFutureSixDays = now.plus(sixDayPeriod); + + String dateRangeConstraint = ":beginRange <= a.expirationDate and :endRange > a.expirationDate"; + + LocalDateTime beginRange = now; + LocalDateTime endRange = inFutureSevenDays; if (boundary) { - dateRangeConstraint = - "(sysdate + 6) <= a.expirationDate and (sysdate + 7) > a.expirationDate"; + dateRangeConstraint = ":beginRange <= a.expirationDate and :endRange > a.expirationDate"; + + beginRange = inFutureSixDays; } TypedQuery q = @@ -356,6 +369,8 @@ public List checkForUpcomingVerificationExpirations( RFControlVerification.class); q.setParameter("facility", facility); + q.setParameter("beginRange", Timestamp.valueOf(beginRange)); + q.setParameter("endRange", Timestamp.valueOf(endRange)); List list = q.getResultList(); diff --git a/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java b/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java index 722b5a7f..05d49020 100644 --- a/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java @@ -1,12 +1,12 @@ package org.jlab.jam.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.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.jam.persistence.entity.RFControlVerificationHistory; /** diff --git a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java index 63c23d63..68875af7 100644 --- a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java +++ b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java @@ -1,16 +1,16 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; 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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.*; /** diff --git a/src/main/java/org/jlab/jam/business/session/VerificationTeamFacade.java b/src/main/java/org/jlab/jam/business/session/VerificationTeamFacade.java index da1af9ba..7fe46d54 100644 --- a/src/main/java/org/jlab/jam/business/session/VerificationTeamFacade.java +++ b/src/main/java/org/jlab/jam/business/session/VerificationTeamFacade.java @@ -1,14 +1,14 @@ package org.jlab.jam.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; import java.util.ArrayList; import java.util.Collections; 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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.VerificationTeam; import org.jlab.smoothness.business.service.UserAuthorizationService; import org.jlab.smoothness.persistence.view.User; diff --git a/src/main/java/org/jlab/jam/business/session/WatcherFacade.java b/src/main/java/org/jlab/jam/business/session/WatcherFacade.java index 280de070..85ea9f10 100644 --- a/src/main/java/org/jlab/jam/business/session/WatcherFacade.java +++ b/src/main/java/org/jlab/jam/business/session/WatcherFacade.java @@ -1,17 +1,17 @@ package org.jlab.jam.business.session; +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 jakarta.persistence.criteria.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -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 javax.persistence.criteria.*; import org.jlab.jam.persistence.entity.Facility; import org.jlab.jam.persistence.entity.Watcher; import org.jlab.jam.persistence.entity.WatcherPK; diff --git a/src/main/java/org/jlab/jam/persistence/entity/Authorizer.java b/src/main/java/org/jlab/jam/persistence/entity/Authorizer.java index a06a507b..5ac3118f 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/Authorizer.java +++ b/src/main/java/org/jlab/jam/persistence/entity/Authorizer.java @@ -1,9 +1,9 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/AuthorizerPK.java b/src/main/java/org/jlab/jam/persistence/entity/AuthorizerPK.java index 9e6a1270..bbf7b616 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/AuthorizerPK.java +++ b/src/main/java/org/jlab/jam/persistence/entity/AuthorizerPK.java @@ -1,9 +1,9 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import org.jlab.jam.persistence.enumeration.OperationsType; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java index 9874bf1c..57e52d68 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.jam.business.session.AbstractFacade; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java index dbf52fc3..c9edf3f1 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java index e6ed2a42..ac53f07f 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java @@ -1,23 +1,23 @@ package org.jlab.jam.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.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -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.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java index e3c39224..4d36097f 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.math.BigInteger; import java.util.List; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.jam.persistence.view.BeamDestinationVerification; import org.jlab.smoothness.persistence.util.YnStringToBoolean; diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java index 14873950..405e07d5 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.smoothness.persistence.util.YnStringToBoolean; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/Component.java b/src/main/java/org/jlab/jam/persistence/entity/Component.java index f82e60f0..19719a8f 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/Component.java +++ b/src/main/java/org/jlab/jam/persistence/entity/Component.java @@ -1,10 +1,10 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java index 3636c9fe..4eeddc7e 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java +++ b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.jam.persistence.view.DocLink; import org.jlab.jam.persistence.view.FacilityControlVerification; diff --git a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java b/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java index 80bc7e58..949f0a65 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java +++ b/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.validation.constraints.NotNull; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/Facility.java b/src/main/java/org/jlab/jam/persistence/entity/Facility.java index 22132f8a..567b170b 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/Facility.java +++ b/src/main/java/org/jlab/jam/persistence/entity/Facility.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java index f8d8c16b..7ce92c27 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.jam.business.session.AbstractFacade; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java index 27116ce1..fd28dda1 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java index cf845834..9bf54354 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java index 6a0e9434..20588d35 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.math.BigInteger; import java.util.List; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.jam.persistence.view.RFSegmentVerification; import org.jlab.smoothness.persistence.util.YnStringToBoolean; diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java index d9264b95..2a67a03d 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java +++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.smoothness.persistence.util.YnStringToBoolean; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java b/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java index ed327bd3..7c09bff7 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java +++ b/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java @@ -1,11 +1,11 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.validation.constraints.NotNull; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/VerificationTeam.java b/src/main/java/org/jlab/jam/persistence/entity/VerificationTeam.java index f2b332ba..6c23686a 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/VerificationTeam.java +++ b/src/main/java/org/jlab/jam/persistence/entity/VerificationTeam.java @@ -1,12 +1,12 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; import java.util.List; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.smoothness.persistence.view.User; /** diff --git a/src/main/java/org/jlab/jam/persistence/entity/Watcher.java b/src/main/java/org/jlab/jam/persistence/entity/Watcher.java index 9589cf2c..f9ecf0e0 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/Watcher.java +++ b/src/main/java/org/jlab/jam/persistence/entity/Watcher.java @@ -1,9 +1,9 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.io.Serializable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/entity/WatcherPK.java b/src/main/java/org/jlab/jam/persistence/entity/WatcherPK.java index 574848ef..635fa6c1 100644 --- a/src/main/java/org/jlab/jam/persistence/entity/WatcherPK.java +++ b/src/main/java/org/jlab/jam/persistence/entity/WatcherPK.java @@ -1,9 +1,9 @@ package org.jlab.jam.persistence.entity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import org.jlab.jam.persistence.enumeration.OperationsType; /** diff --git a/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java b/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java index 11af1029..80d1907c 100644 --- a/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java +++ b/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java @@ -1,16 +1,16 @@ package org.jlab.jam.persistence.view; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java index 3a6b80b4..ded5116f 100644 --- a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java +++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java @@ -1,8 +1,8 @@ package org.jlab.jam.persistence.view; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; -import javax.persistence.*; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java index 266ed195..5a1782b4 100644 --- a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java +++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java @@ -1,9 +1,9 @@ package org.jlab.jam.persistence.view; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import org.jlab.jam.persistence.entity.CreditedControl; import org.jlab.jam.persistence.entity.Facility; diff --git a/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java b/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java index f6d4bce7..80bebfd5 100644 --- a/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java +++ b/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java @@ -1,10 +1,10 @@ package org.jlab.jam.persistence.view; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; /** * @author ryans diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java index 2e6b807f..c3f151fe 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java @@ -1,14 +1,14 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.DecimalFormat; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.BeamAuthorizationFacade; import org.jlab.jam.persistence.entity.BeamAuthorization; import org.jlab.jam.persistence.entity.Facility; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java b/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java index af51b827..deb8fe17 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java @@ -1,11 +1,11 @@ package org.jlab.jam.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/jam/presentation/controller/ControlVerification.java b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java index e1f87d5e..492014c4 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.AbstractFacade.OrderDirective; import org.jlab.jam.business.session.BeamControlVerificationFacade; import org.jlab.jam.business.session.CreditedControlFacade; diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java index 9d2ca1df..fee8eda9 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java +++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java @@ -1,14 +1,14 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.BeamDestinationFacade; import org.jlab.jam.persistence.entity.BeamDestination; import org.jlab.smoothness.presentation.util.ParamConverter; diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java index ea6c1f22..3db65605 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.text.DecimalFormat; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.BeamControlVerificationFacade; import org.jlab.jam.business.session.BeamControlVerificationHistoryFacade; import org.jlab.jam.business.session.CreditedControlFacade; diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java index cd12c718..f333e45e 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.List; import java.util.Map; -import javax.ejb.EJB; -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.jam.business.session.BeamAuthorizationFacade; import org.jlab.jam.business.session.BeamDestinationFacade; import org.jlab.jam.persistence.entity.*; diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java index 4872975f..0b240d7c 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java +++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java @@ -1,5 +1,11 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.nio.file.Path; @@ -7,12 +13,6 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import javax.ejb.EJB; -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.jam.business.session.*; import org.jlab.jam.persistence.entity.*; import org.jlab.jam.persistence.enumeration.OperationsType; diff --git a/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java index a956036e..22d2b42b 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java @@ -1,14 +1,14 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.DecimalFormat; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.RFAuthorizationFacade; import org.jlab.jam.persistence.entity.Facility; import org.jlab.jam.persistence.entity.RFSegment; diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java index f35c3140..f2424783 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java +++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java @@ -1,14 +1,14 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.RFSegmentFacade; import org.jlab.jam.persistence.entity.RFSegment; import org.jlab.smoothness.presentation.util.ParamConverter; diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java index 813b8684..0dcbecce 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.text.DecimalFormat; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.CreditedControlFacade; import org.jlab.jam.business.session.RFControlVerificationFacade; import org.jlab.jam.business.session.RFControlVerificationHistoryFacade; diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java index e4117d73..4e7a3128 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.List; import java.util.Map; -import javax.ejb.EJB; -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.jam.business.session.RFAuthorizationFacade; import org.jlab.jam.business.session.RFSegmentFacade; import org.jlab.jam.persistence.entity.*; diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java index 2fb3bfec..e19bacf0 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java @@ -1,16 +1,16 @@ package org.jlab.jam.presentation.controller; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.ejb.EJB; -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.jam.business.session.*; import org.jlab.jam.business.session.AbstractFacade.OrderDirective; import org.jlab.jam.persistence.entity.*; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddAuthorizer.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddAuthorizer.java index afac93b7..8056f5e9 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddAuthorizer.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddAuthorizer.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.AuthorizerFacade; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.presentation.controller.inventory.AuthorizersController; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddComponent.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddComponent.java index 8b1e66bc..657b0cdb 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddComponent.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddComponent.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.ComponentFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddControl.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddControl.java index ee434020..e06c68ff 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddControl.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddControl.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.CreditedControlFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddWatcher.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddWatcher.java index c9a7cebe..62b5592c 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/AddWatcher.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/AddWatcher.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.WatcherFacade; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.presentation.controller.inventory.AuthorizersController; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ComponentSearch.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ComponentSearch.java index b7daca93..306a139f 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ComponentSearch.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ComponentSearch.java @@ -1,5 +1,10 @@ package org.jlab.jam.presentation.controller.ajax; +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.net.URI; import java.net.URISyntaxException; @@ -8,11 +13,6 @@ import java.net.http.HttpResponse; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -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.smoothness.business.service.SettingsService; import org.jlab.smoothness.presentation.util.ParamBuilder; import org.jlab.smoothness.presentation.util.ServletUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java index 0223f68b..7c038609 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java @@ -1,5 +1,13 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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.OutputStream; import java.math.BigDecimal; @@ -11,14 +19,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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.jam.business.session.*; import org.jlab.jam.persistence.entity.BeamDestinationAuthorization; import org.jlab.jam.persistence.entity.DestinationAuthorizationPK; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditControl.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditControl.java index 02d39103..e3108ec3 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditControl.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditControl.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.CreditedControlFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditOperationsVerifications.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditOperationsVerifications.java index 4b3bbc20..60c214c3 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditOperationsVerifications.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditOperationsVerifications.java @@ -1,17 +1,17 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +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.PrintWriter; import java.math.BigInteger; import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -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.jam.business.session.BeamControlVerificationFacade; import org.jlab.jam.business.session.RFControlVerificationFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java index b57e8a9d..2037ebb4 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java @@ -1,5 +1,13 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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.OutputStream; import java.math.BigInteger; @@ -10,14 +18,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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.jam.business.session.*; import org.jlab.jam.persistence.entity.*; import org.jlab.smoothness.business.exception.UserFriendlyException; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ForceExpirationCheckAll.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ForceExpirationCheckAll.java index 0dc485b7..addeb570 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ForceExpirationCheckAll.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ForceExpirationCheckAll.java @@ -1,20 +1,20 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.DailyScheduledCheck; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveAuthorizer.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveAuthorizer.java index 94337b49..f27d9942 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveAuthorizer.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveAuthorizer.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.AuthorizerFacade; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.presentation.controller.inventory.AuthorizersController; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveComponent.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveComponent.java index 97c8ac36..9efa00b8 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveComponent.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveComponent.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.ComponentFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveControl.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveControl.java index 03754999..1c10366c 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveControl.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveControl.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.CreditedControlFacade; import org.jlab.smoothness.business.exception.UserFriendlyException; import org.jlab.smoothness.business.util.ExceptionUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveWatcher.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveWatcher.java index 2b7bc88b..d37088e1 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveWatcher.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/RemoveWatcher.java @@ -1,21 +1,21 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +import jakarta.json.Json; +import jakarta.json.stream.JsonGenerator; +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 jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.EJBException; -import javax.json.Json; -import javax.json.stream.JsonGenerator; -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 javax.validation.ConstraintViolationException; import org.jlab.jam.business.session.WatcherFacade; import org.jlab.jam.persistence.enumeration.OperationsType; import org.jlab.jam.presentation.controller.inventory.AuthorizersController; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java index c95cfdd0..59c9df99 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java @@ -1,17 +1,17 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +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 java.io.PrintWriter; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -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.jam.business.session.BeamControlVerificationFacade; import org.jlab.smoothness.presentation.util.ParamConverter; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java index 524e4320..5d38bb22 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java @@ -1,17 +1,17 @@ package org.jlab.jam.presentation.controller.ajax; +import jakarta.ejb.EJB; +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 java.io.PrintWriter; import java.math.BigInteger; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ejb.EJB; -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.jam.business.session.RFControlVerificationFacade; import org.jlab.smoothness.presentation.util.ParamConverter; diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/UserSearch.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/UserSearch.java index fabeb8b4..da6e69a2 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/ajax/UserSearch.java +++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/UserSearch.java @@ -1,5 +1,10 @@ package org.jlab.jam.presentation.controller.ajax; +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.net.URI; import java.net.URISyntaxException; @@ -8,11 +13,6 @@ import java.net.http.HttpResponse; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -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.smoothness.business.service.SettingsService; import org.jlab.smoothness.presentation.util.ParamBuilder; import org.jlab.smoothness.presentation.util.ServletUtil; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java index 33a243d4..58225c30 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.AbstractFacade; import org.jlab.jam.business.session.AuthorizerFacade; import org.jlab.jam.business.session.FacilityFacade; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java index 3512a4a6..7fa09894 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.AbstractFacade; import org.jlab.jam.business.session.CreditedControlFacade; import org.jlab.jam.business.session.VerificationTeamFacade; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java index 2bbe9d78..d0126ec6 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java @@ -1,13 +1,13 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.util.List; -import javax.ejb.EJB; -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.jam.business.session.BeamDestinationFacade; import org.jlab.jam.persistence.entity.BeamDestination; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java index 0b25899a..d409a33d 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java @@ -1,13 +1,13 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.util.List; -import javax.ejb.EJB; -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.jam.business.session.AbstractFacade; import org.jlab.jam.business.session.FacilityFacade; import org.jlab.jam.persistence.entity.Facility; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java index 841e1dd6..1f3d9567 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java @@ -1,14 +1,14 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.*; import org.jlab.jam.persistence.entity.BeamDestination; import org.jlab.jam.persistence.entity.CreditedControl; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java index 6d33767b..f02d726e 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java @@ -2,14 +2,14 @@ import static org.jlab.jam.business.session.AbstractFacade.OrderDirective; +import jakarta.ejb.EJB; +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.util.List; -import javax.ejb.EJB; -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.jam.business.session.RFSegmentFacade; import org.jlab.jam.persistence.entity.RFSegment; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java index 874a88fb..d84a8677 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java @@ -1,13 +1,13 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.util.List; -import javax.ejb.EJB; -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.jam.business.session.VerificationTeamFacade; import org.jlab.jam.persistence.entity.VerificationTeam; diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java index 66199212..e236e4fb 100644 --- a/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java +++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java @@ -1,15 +1,15 @@ package org.jlab.jam.presentation.controller.inventory; +import jakarta.ejb.EJB; +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.math.BigInteger; import java.util.ArrayList; import java.util.List; -import javax.ejb.EJB; -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.jam.business.session.AbstractFacade; import org.jlab.jam.business.session.FacilityFacade; import org.jlab.jam.business.session.WatcherFacade; diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index d7a06865..93e0d611 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -9,7 +9,6 @@ NONE - org.jlab.smoothness.persistence.entity.Setting diff --git a/src/main/webapp/WEB-INF/functions.tld b/src/main/webapp/WEB-INF/functions.tld index e89b2ca3..76762f9c 100644 --- a/src/main/webapp/WEB-INF/functions.tld +++ b/src/main/webapp/WEB-INF/functions.tld @@ -1,25 +1,20 @@ - + Custom Functions 1.0 jam - http://jlab.org/jam/functions + jlab.tags.jam beamModeList org.jlab.jam.presentation.util.WebFunctions java.util.List beamModeList(java.lang.String, java.lang.String) - - rfModeList - org.jlab.jam.presentation.util.WebFunctions - java.util.List rfModeList(java.lang.String, java.lang.String) - laseModeList org.jlab.jam.presentation.util.WebFunctions diff --git a/src/main/webapp/WEB-INF/tags/app-script.tag b/src/main/webapp/WEB-INF/tags/app-script.tag index 8487161b..3eebaf70 100644 --- a/src/main/webapp/WEB-INF/tags/app-script.tag +++ b/src/main/webapp/WEB-INF/tags/app-script.tag @@ -1,4 +1,4 @@ <%@tag description="App Style Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag index 4bdf3ba0..32c0cd7b 100644 --- a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag @@ -1,9 +1,9 @@ <%@tag description="Permissions Table Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> <%@attribute name="rfList" required="true" type="java.util.List"%> <%@attribute name="beamList" required="true" type="java.util.List"%> diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag index e436f781..43103d47 100644 --- a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag @@ -1,9 +1,9 @@ <%@tag description="Destination Table Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> <%@attribute name="beamList" required="true" type="java.util.List"%> <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%> diff --git a/src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag b/src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag index 2e6445c9..df345999 100644 --- a/src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag +++ b/src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag @@ -1,7 +1,7 @@ <%@tag description="The Authorization Page Template Tag" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions" %> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@attribute name="title" %> <%@attribute name="stylesheets" fragment="true" %> <%@attribute name="scripts" fragment="true" %> @@ -13,7 +13,7 @@ - +
diff --git a/src/main/webapp/WEB-INF/tags/inventory-page.tag b/src/main/webapp/WEB-INF/tags/inventory-page.tag index 7f405ab2..1634c4ff 100644 --- a/src/main/webapp/WEB-INF/tags/inventory-page.tag +++ b/src/main/webapp/WEB-INF/tags/inventory-page.tag @@ -1,6 +1,6 @@ <%@tag description="The Inventory Page Template" pageEncoding="UTF-8"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions" %> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@attribute name="title"%> <%@attribute name="stylesheets" fragment="true"%> <%@attribute name="scripts" fragment="true"%> diff --git a/src/main/webapp/WEB-INF/tags/primary-nav.tag b/src/main/webapp/WEB-INF/tags/primary-nav.tag index cce689b8..ed45b1be 100644 --- a/src/main/webapp/WEB-INF/tags/primary-nav.tag +++ b/src/main/webapp/WEB-INF/tags/primary-nav.tag @@ -1,8 +1,8 @@ <%@tag description="Primary Navigation Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%>
    Authorizations Verifications diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag index 2565f83e..d5346179 100644 --- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag +++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag @@ -1,9 +1,9 @@ <%@tag description="RF Operations Table Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> <%@attribute name="rfList" required="true" type="java.util.List"%> <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%> diff --git a/src/main/webapp/WEB-INF/tags/setup-nav.tag b/src/main/webapp/WEB-INF/tags/setup-nav.tag index b173ad1d..e29e6ae5 100644 --- a/src/main/webapp/WEB-INF/tags/setup-nav.tag +++ b/src/main/webapp/WEB-INF/tags/setup-nav.tag @@ -1,8 +1,8 @@ <%@tag description="Setup Navigation Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%>
      Settings diff --git a/src/main/webapp/WEB-INF/tags/verification-panel.tag b/src/main/webapp/WEB-INF/tags/verification-panel.tag index d71185b4..6f36eada 100644 --- a/src/main/webapp/WEB-INF/tags/verification-panel.tag +++ b/src/main/webapp/WEB-INF/tags/verification-panel.tag @@ -1,9 +1,9 @@ <%@tag description="Verification Panel Tag" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> <%@attribute name="operationsType" required="true" type="java.lang.String"%> <%@attribute name="operationsList" required="true" type="java.util.List"%> diff --git a/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp index 0aeed001..9fa7bbd7 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp index 73af4b58..6b3dae6b 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp index 0d08aea5..83beae4d 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp index 350f4498..6ce02609 100644 --- a/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp +++ b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/control-verification.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp index 9c7c31ba..a7f2c9d7 100644 --- a/src/main/webapp/WEB-INF/views/control-verification.jsp +++ b/src/main/webapp/WEB-INF/views/control-verification.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/destination-verification.jsp b/src/main/webapp/WEB-INF/views/destination-verification.jsp index 6a8ae079..fd1da135 100644 --- a/src/main/webapp/WEB-INF/views/destination-verification.jsp +++ b/src/main/webapp/WEB-INF/views/destination-verification.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/facility-authorization.jsp b/src/main/webapp/WEB-INF/views/facility-authorization.jsp index bbdab851..7152ec54 100644 --- a/src/main/webapp/WEB-INF/views/facility-authorization.jsp +++ b/src/main/webapp/WEB-INF/views/facility-authorization.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp index bd8cdbd9..339c3a48 100644 --- a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp index 6a45863f..f5d63dc2 100644 --- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/destinations.jsp b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp index f9e2d350..d56003ef 100644 --- a/src/main/webapp/WEB-INF/views/inventory/destinations.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/facilities.jsp b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp index 034b0b79..75fce8f9 100644 --- a/src/main/webapp/WEB-INF/views/inventory/facilities.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/participation.jsp b/src/main/webapp/WEB-INF/views/inventory/participation.jsp index a8debcb9..e41f2c95 100644 --- a/src/main/webapp/WEB-INF/views/inventory/participation.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/participation.jsp @@ -1,7 +1,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions" %> +<%@taglib prefix="c" uri="jakarta.tags.core" %> +<%@taglib prefix="fn" uri="jakarta.tags.functions" %> +<%@taglib prefix="jam" uri="jlab.tags.jam" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> diff --git a/src/main/webapp/WEB-INF/views/inventory/segments.jsp b/src/main/webapp/WEB-INF/views/inventory/segments.jsp index f47195cd..7283d840 100644 --- a/src/main/webapp/WEB-INF/views/inventory/segments.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/segments.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp index 1407f7fd..77db7483 100644 --- a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> +<%@taglib prefix="c" uri="jakarta.tags.core" %> +<%@taglib prefix="fn" uri="jakarta.tags.functions" %> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt" %> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> <%@taglib prefix="t" tagdir="/WEB-INF/tags" %> diff --git a/src/main/webapp/WEB-INF/views/inventory/watchers.jsp b/src/main/webapp/WEB-INF/views/inventory/watchers.jsp index 8dfcb898..1daf18b8 100644 --- a/src/main/webapp/WEB-INF/views/inventory/watchers.jsp +++ b/src/main/webapp/WEB-INF/views/inventory/watchers.jsp @@ -1,8 +1,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/segment-verification.jsp b/src/main/webapp/WEB-INF/views/segment-verification.jsp index 6c9d0349..1b608914 100644 --- a/src/main/webapp/WEB-INF/views/segment-verification.jsp +++ b/src/main/webapp/WEB-INF/views/segment-verification.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp index ee594b65..04396adb 100644 --- a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp +++ b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp index a46c56d3..20a6fa52 100644 --- a/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp +++ b/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp index 9d52f3f6..d16ef30e 100644 --- a/src/main/webapp/WEB-INF/views/verifications.jsp +++ b/src/main/webapp/WEB-INF/views/verifications.jsp @@ -1,9 +1,9 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %> -<%@taglib prefix="jam" uri="http://jlab.org/jam/functions" %> +<%@taglib prefix="c" uri="jakarta.tags.core" %> +<%@taglib prefix="fn" uri="jakarta.tags.functions" %> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt" %> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam" %> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 4efe71ce..bf88dc62 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"> appName JLab Authorization Manager