From e94d2aad1b3295633b0a1588a28e0746cc9f5c11 Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Tue, 23 Dec 2025 16:29:12 -0500 Subject: [PATCH 1/3] Bump Wildfly to v37 Fixes #16 --- Dockerfile | 2 +- build.gradle | 18 +++---- deps.yaml | 17 +++---- .../business/exception/WebAppException.java | 2 +- .../business/session/AbstractFacade.java | 12 ++--- .../session/AccActivityRecordFacade.java | 6 +-- .../business/session/AccessRecordFacade.java | 6 +-- .../session/BeamToHallRecordFacade.java | 6 +-- .../business/session/BodySlideFacade.java | 6 +-- .../business/session/BtaRecordFacade.java | 6 +-- .../session/BtaShiftInfoSlideFacade.java | 10 ++-- .../session/CCPresentationFacade.java | 10 ++-- .../session/DailyScheduledLogger.java | 18 +++---- .../business/session/IFrameSlideFacade.java | 6 +-- .../business/session/ImageSlideFacade.java | 6 +-- .../session/LASOPresentationFacade.java | 10 ++-- .../session/LOPresentationFacade.java | 10 ++-- .../session/PDPresentationFacade.java | 16 +++---- .../business/session/PdAccessSlideFacade.java | 6 +-- .../session/PdBeamAccSlideFacade.java | 6 +-- .../business/session/PdInfoSlideFacade.java | 6 +-- .../business/session/PresentationFacade.java | 32 ++++++------- .../session/PresentationLogFacade.java | 6 +-- .../session/ShiftInfoSlideFacade.java | 6 +-- .../session/ShiftPresentationFacade.java | 2 +- .../business/session/SlideFacade.java | 16 +++---- .../session/TitleBodyImageSlideFacade.java | 6 +-- .../session/TitleBodySlideFacade.java | 6 +-- .../session/TitleImageSlideFacade.java | 6 +-- .../session/UITFPresentationFacade.java | 10 ++-- .../session/WeeklyScheduledLogger.java | 18 +++---- .../jlab/presenter/business/util/IOUtil.java | 2 +- .../persistence/entity/AccActivityRecord.java | 24 +++++----- .../persistence/entity/AccessRecord.java | 24 +++++----- .../persistence/entity/BeamToHallRecord.java | 24 +++++----- .../persistence/entity/BodySlide.java | 16 +++---- .../persistence/entity/BtaRecord.java | 24 +++++----- .../persistence/entity/BtaShiftInfoSlide.java | 12 ++--- .../persistence/entity/CCPresentation.java | 26 +++++----- .../persistence/entity/IFrameSlide.java | 14 +++--- .../persistence/entity/ImageSlide.java | 8 ++-- .../persistence/entity/LASOPresentation.java | 26 +++++----- .../persistence/entity/LOPresentation.java | 26 +++++----- .../persistence/entity/PDPresentation.java | 26 +++++----- .../persistence/entity/PdAccessSlide.java | 16 +++---- .../persistence/entity/PdBeamAccSlide.java | 12 ++--- .../persistence/entity/PdInfoSlide.java | 24 +++++----- .../persistence/entity/Presentation.java | 48 +++++++++---------- .../persistence/entity/PresentationLog.java | 14 +++--- .../persistence/entity/PresentationLogPK.java | 10 ++-- .../persistence/entity/ShiftInfoSlide.java | 24 +++++----- .../presenter/persistence/entity/Slide.java | 42 ++++++++-------- .../entity/TitleBodyImageSlide.java | 10 ++-- .../persistence/entity/TitleBodySlide.java | 18 +++---- .../persistence/entity/TitleImageSlide.java | 10 ++-- .../persistence/entity/UITFPresentation.java | 26 +++++----- .../presentation/controller/CCMenu.java | 14 +++--- .../presentation/controller/Convert.java | 10 ++-- .../presentation/controller/DeleteSlide.java | 12 ++--- .../presentation/controller/ElogHtml.java | 12 ++--- .../presentation/controller/Error.java | 20 ++++---- .../controller/ImportShiftLogs.java | 12 ++--- .../controller/ImportSummary.java | 12 ++--- .../presentation/controller/KeepAlive.java | 12 ++--- .../presentation/controller/LASOMenu.java | 14 +++--- .../presentation/controller/LOMenu.java | 14 +++--- .../presentation/controller/Logout.java | 10 ++-- .../presentation/controller/NewSlide.java | 12 ++--- .../presentation/controller/PDAfternoon.java | 12 ++--- .../presentation/controller/PDMenu.java | 14 +++--- .../presentation/controller/PDMorning.java | 12 ++--- .../presentation/controller/Relogin.java | 10 ++-- .../presentation/controller/Resize.java | 14 +++--- .../presentation/controller/SSORedirect.java | 10 ++-- .../presentation/controller/SaveSlide.java | 20 ++++---- .../controller/SaveSlideOrder.java | 12 ++--- .../presentation/controller/SendToElog.java | 14 +++--- .../controller/ShowPresentation.java | 12 ++--- .../presentation/controller/UITFMenu.java | 14 +++--- .../presentation/filter/CacheFilter.java | 20 ++++---- .../filter/CharacterEncodingFilter.java | 16 +++---- .../presentation/filter/IPAuthFilter.java | 8 ++-- .../presentation/filter/LocaleFilter.java | 18 +++---- .../filter/PublicProxyFilter.java | 8 ++-- .../util/ConfigurationParameterInit.java | 8 ++-- .../util/ConvertAndValidateUtil.java | 2 +- .../util/InternalRequestWrapper.java | 4 +- .../util/InternalResponseWrapper.java | 8 ++-- .../util/PresentationMenuUtil.java | 4 +- .../presentation/util/SlideUtil.java | 2 +- .../presentation/util/TemplateExecutor.java | 6 +-- src/main/resources/META-INF/persistence.xml | 1 - src/main/webapp/WEB-INF/functions.tld | 10 ++-- .../WEB-INF/jboss-deployment-structure.xml | 10 ---- .../cebaf-shift-log-overflow.jsp | 4 +- .../slide-templates/cebaf-shift-log.jsp | 6 +-- .../WEB-INF/slide-templates/date-iframe.jsp | 4 +- .../webapp/WEB-INF/slide-templates/iframe.jsp | 4 +- .../webapp/WEB-INF/slide-templates/image.jsp | 4 +- .../slide-templates/laso-shift-log.jsp | 6 +-- .../WEB-INF/slide-templates/lo-shift-log.jsp | 6 +-- .../slide-templates/pd-shift-summary.jsp | 6 +-- .../slide-templates/pd-summary-overflow.jsp | 4 +- .../webapp/WEB-INF/slide-templates/sum1.jsp | 6 +-- .../webapp/WEB-INF/slide-templates/sum2-1.jsp | 6 +-- .../webapp/WEB-INF/slide-templates/sum2-2.jsp | 6 +-- .../webapp/WEB-INF/slide-templates/sum2-3.jsp | 6 +-- .../webapp/WEB-INF/slide-templates/sum2-4.jsp | 4 +- .../title-dynamic-two-columns.jsp | 4 +- .../WEB-INF/slide-templates/title-image.jsp | 4 +- .../slide-templates/title-text-image.jsp | 4 +- .../WEB-INF/slide-templates/title-text.jsp | 4 +- .../slide-templates/uitf-shift-log.jsp | 6 +-- src/main/webapp/WEB-INF/tags/page.tag | 8 ++-- src/main/webapp/WEB-INF/views/cc-menu.jsp | 6 +-- src/main/webapp/WEB-INF/views/error.jsp | 6 +-- src/main/webapp/WEB-INF/views/laso-menu.jsp | 6 +-- src/main/webapp/WEB-INF/views/lo-menu.jsp | 6 +-- src/main/webapp/WEB-INF/views/pd-menu.jsp | 6 +-- .../webapp/WEB-INF/views/presentation.jsp | 8 ++-- src/main/webapp/WEB-INF/views/relogin.jsp | 6 +-- src/main/webapp/WEB-INF/views/uitf-menu.jsp | 6 +-- src/main/webapp/WEB-INF/web.xml | 6 +-- 123 files changed, 683 insertions(+), 697 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jboss-deployment-structure.xml diff --git a/Dockerfile b/Dockerfile index 306fe81..6534a7b 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/build.gradle b/build.gradle index 8a6e229..1559bc7 100644 --- a/build.gradle +++ b/build.gradle @@ -22,15 +22,17 @@ dependencies { implementation 'org.apache.httpcomponents:httpmime:4.5.14' // Setup should install these into Wildfly - providedCompile 'org.tuckey:urlrewritefilter:4.0.4', - 'org.jlab:jlog:5.0.0' + providedCompile 'org.tuckey:urlrewritefilter:5.1.3', + 'org.jlab:jlog:5.2.0' - // Wildfly 26.1.3.Final provides: - providedCompile 'javax:javaee-api:8.0.1', - 'javax.servlet:jstl:1.2', - 'org.hibernate:hibernate-core:5.3.28.Final', - 'org.hibernate:hibernate-envers:5.3.28.Final', - 'org.jsoup:jsoup:1.14.2' + // Wildfly 37.0.1.Final provides: + providedCompile 'jakarta.platform:jakarta.jakartaee-api:10.0.0', + 'org.hibernate:hibernate-core:6.6.19.Final', + 'org.hibernate:hibernate-envers:6.6.19.Final', + 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1' + + // Latest Wildfly no longer includes... + implementation 'org.jsoup:jsoup:1.21.2' } tasks.named('jar') { enabled = false diff --git a/deps.yaml b/deps.yaml index 1df9caf..a6348c9 100644 --- a/deps.yaml +++ b/deps.yaml @@ -13,23 +13,18 @@ services: - ./container/oracle/initdb.d:/container-entrypoint-initdb.d keycloak: - image: jeffersonlab/keycloak:1.1.1 + image: jeffersonlab/keycloak:2.1.0 hostname: keycloak container_name: keycloak ports: - "8081:8080" - "9991:9990" environment: - KEYCLOAK_ADMIN: admin - KEYCLOAK_ADMIN_PASSWORD: admin - KEYCLOAK_FRONTEND_HOSTNAME: 'localhost' - KEYCLOAK_FRONTEND_PORT: '8081' - KEYCLOAK_SERVER_URL: 'http://keycloak:8080' - KEYCLOAK_HOME: '/opt/keycloak' - KEYCLOAK_REALM: 'test-realm' - KEYCLOAK_RESOURCE: 'presenter' - KEYCLOAK_SECRET: 'yHi6W2raPmLvPXoxqMA7VWbLAA2WN0eB' - TZ: 'America/New_York' + KC_FRONTEND_URL: 'http://localhost:8081/auth' + KC_BACKEND_URL: 'http://keycloak:8080/auth' + KC_HTTP_RELATIVE_PATH: '/auth' + KC_BOOTSTRAP_ADMIN_USERNAME: 'admin' + KC_BOOTSTRAP_ADMIN_PASSWORD: 'admin' volumes: - ./container/keycloak/initdb.d:/container-entrypoint-initdb.d diff --git a/src/main/java/org/jlab/presenter/business/exception/WebAppException.java b/src/main/java/org/jlab/presenter/business/exception/WebAppException.java index bee4faf..b854bf2 100644 --- a/src/main/java/org/jlab/presenter/business/exception/WebAppException.java +++ b/src/main/java/org/jlab/presenter/business/exception/WebAppException.java @@ -1,6 +1,6 @@ package org.jlab.presenter.business.exception; -import javax.ejb.ApplicationException; +import jakarta.ejb.ApplicationException; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/business/session/AbstractFacade.java b/src/main/java/org/jlab/presenter/business/session/AbstractFacade.java index 95536b4..5f4df83 100644 --- a/src/main/java/org/jlab/presenter/business/session/AbstractFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/AbstractFacade.java @@ -1,12 +1,12 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; import java.util.List; -import javax.annotation.security.PermitAll; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/business/session/AccActivityRecordFacade.java b/src/main/java/org/jlab/presenter/business/session/AccActivityRecordFacade.java index 0d8c044..bac8cf9 100644 --- a/src/main/java/org/jlab/presenter/business/session/AccActivityRecordFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/AccActivityRecordFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.AccActivityRecord; /** diff --git a/src/main/java/org/jlab/presenter/business/session/AccessRecordFacade.java b/src/main/java/org/jlab/presenter/business/session/AccessRecordFacade.java index 7fa29cf..dc528ff 100644 --- a/src/main/java/org/jlab/presenter/business/session/AccessRecordFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/AccessRecordFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.AccessRecord; /** diff --git a/src/main/java/org/jlab/presenter/business/session/BeamToHallRecordFacade.java b/src/main/java/org/jlab/presenter/business/session/BeamToHallRecordFacade.java index 771c096..ec2e601 100644 --- a/src/main/java/org/jlab/presenter/business/session/BeamToHallRecordFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/BeamToHallRecordFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.BeamToHallRecord; /** diff --git a/src/main/java/org/jlab/presenter/business/session/BodySlideFacade.java b/src/main/java/org/jlab/presenter/business/session/BodySlideFacade.java index e8cdcb9..d9e6f2d 100644 --- a/src/main/java/org/jlab/presenter/business/session/BodySlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/BodySlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.BodySlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/BtaRecordFacade.java b/src/main/java/org/jlab/presenter/business/session/BtaRecordFacade.java index 905b53b..f29f766 100644 --- a/src/main/java/org/jlab/presenter/business/session/BtaRecordFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/BtaRecordFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.BtaRecord; /** diff --git a/src/main/java/org/jlab/presenter/business/session/BtaShiftInfoSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/BtaShiftInfoSlideFacade.java index 2e72873..1777619 100644 --- a/src/main/java/org/jlab/presenter/business/session/BtaShiftInfoSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/BtaShiftInfoSlideFacade.java @@ -1,11 +1,11 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import java.math.BigInteger; -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; import org.jlab.presenter.persistence.entity.BtaShiftInfoSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/CCPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/CCPresentationFacade.java index 884cca9..caec570 100644 --- a/src/main/java/org/jlab/presenter/business/session/CCPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/CCPresentationFacade.java @@ -1,13 +1,13 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.jlab.presenter.persistence.entity.CCPresentation; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/business/session/DailyScheduledLogger.java b/src/main/java/org/jlab/presenter/business/session/DailyScheduledLogger.java index c086b21..04386de 100644 --- a/src/main/java/org/jlab/presenter/business/session/DailyScheduledLogger.java +++ b/src/main/java/org/jlab/presenter/business/session/DailyScheduledLogger.java @@ -1,19 +1,19 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.ejb.EJB; +import jakarta.ejb.ScheduleExpression; +import jakarta.ejb.Singleton; +import jakarta.ejb.Startup; +import jakarta.ejb.Timeout; +import jakarta.ejb.Timer; +import jakarta.ejb.TimerService; import java.math.BigInteger; import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.ScheduleExpression; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.ejb.Timeout; -import javax.ejb.Timer; -import javax.ejb.TimerService; import org.jlab.presenter.business.util.IOUtil; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.business.util.UrlUtil; diff --git a/src/main/java/org/jlab/presenter/business/session/IFrameSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/IFrameSlideFacade.java index 59ac367..9feadbb 100644 --- a/src/main/java/org/jlab/presenter/business/session/IFrameSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/IFrameSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.IFrameSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/ImageSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/ImageSlideFacade.java index eafa37d..db15c3f 100644 --- a/src/main/java/org/jlab/presenter/business/session/ImageSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/ImageSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.ImageSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/LASOPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/LASOPresentationFacade.java index 3eb4afd..da5ccd3 100644 --- a/src/main/java/org/jlab/presenter/business/session/LASOPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/LASOPresentationFacade.java @@ -1,13 +1,13 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.jlab.presenter.persistence.entity.LASOPresentation; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/business/session/LOPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/LOPresentationFacade.java index 7856c92..5e67de7 100644 --- a/src/main/java/org/jlab/presenter/business/session/LOPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/LOPresentationFacade.java @@ -1,13 +1,13 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.jlab.presenter.persistence.entity.LOPresentation; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java index 3f2a17d..326d668 100644 --- a/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java @@ -1,15 +1,15 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.annotation.security.RolesAllowed; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.*; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.jlab.presenter.business.exception.WebAppException; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.persistence.entity.*; diff --git a/src/main/java/org/jlab/presenter/business/session/PdAccessSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/PdAccessSlideFacade.java index c37c166..710b657 100644 --- a/src/main/java/org/jlab/presenter/business/session/PdAccessSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PdAccessSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.PdAccessSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/PdBeamAccSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/PdBeamAccSlideFacade.java index 37af1ef..82eea86 100644 --- a/src/main/java/org/jlab/presenter/business/session/PdBeamAccSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PdBeamAccSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.PdBeamAccSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/PdInfoSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/PdInfoSlideFacade.java index 814b80e..878049d 100644 --- a/src/main/java/org/jlab/presenter/business/session/PdInfoSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PdInfoSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.PdInfoSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/PresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/PresentationFacade.java index 22c5dc1..8dd9728 100644 --- a/src/main/java/org/jlab/presenter/business/session/PresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PresentationFacade.java @@ -1,5 +1,21 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.Resource; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.SessionContext; +import jakarta.ejb.Stateless; +import jakarta.ejb.TransactionAttribute; +import jakarta.ejb.TransactionAttributeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; @@ -12,22 +28,6 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.Resource; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.EJBAccessException; -import javax.ejb.SessionContext; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.jlog.Body.ContentType; import org.jlab.jlog.Library; import org.jlab.jlog.LogEntry; diff --git a/src/main/java/org/jlab/presenter/business/session/PresentationLogFacade.java b/src/main/java/org/jlab/presenter/business/session/PresentationLogFacade.java index 1cb7998..6e9d7e6 100644 --- a/src/main/java/org/jlab/presenter/business/session/PresentationLogFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PresentationLogFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.PresentationLog; /** diff --git a/src/main/java/org/jlab/presenter/business/session/ShiftInfoSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/ShiftInfoSlideFacade.java index 9231c2d..ce5ed89 100644 --- a/src/main/java/org/jlab/presenter/business/session/ShiftInfoSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/ShiftInfoSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.ShiftInfoSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/ShiftPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/ShiftPresentationFacade.java index 11b43cb..f0ac342 100644 --- a/src/main/java/org/jlab/presenter/business/session/ShiftPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/ShiftPresentationFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; import java.math.BigInteger; import java.util.Date; -import javax.annotation.security.PermitAll; import org.jlab.presenter.persistence.entity.Presentation; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/business/session/SlideFacade.java b/src/main/java/org/jlab/presenter/business/session/SlideFacade.java index 848dd9d..864518d 100644 --- a/src/main/java/org/jlab/presenter/business/session/SlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/SlideFacade.java @@ -1,15 +1,15 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.Resource; +import jakarta.annotation.security.DeclareRoles; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.EJB; +import jakarta.ejb.SessionContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.math.BigInteger; import java.util.List; -import javax.annotation.Resource; -import javax.annotation.security.DeclareRoles; -import javax.annotation.security.PermitAll; -import javax.ejb.EJB; -import javax.ejb.SessionContext; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.persistence.entity.Presentation; import org.jlab.presenter.persistence.entity.Slide; diff --git a/src/main/java/org/jlab/presenter/business/session/TitleBodyImageSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/TitleBodyImageSlideFacade.java index 446b837..c4b5979 100644 --- a/src/main/java/org/jlab/presenter/business/session/TitleBodyImageSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/TitleBodyImageSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.TitleBodyImageSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/TitleBodySlideFacade.java b/src/main/java/org/jlab/presenter/business/session/TitleBodySlideFacade.java index 7bc123f..2d5ef77 100644 --- a/src/main/java/org/jlab/presenter/business/session/TitleBodySlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/TitleBodySlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.TitleBodySlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/TitleImageSlideFacade.java b/src/main/java/org/jlab/presenter/business/session/TitleImageSlideFacade.java index 60c592f..7945889 100644 --- a/src/main/java/org/jlab/presenter/business/session/TitleImageSlideFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/TitleImageSlideFacade.java @@ -1,8 +1,8 @@ package org.jlab.presenter.business.session; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.jlab.presenter.persistence.entity.TitleImageSlide; /** diff --git a/src/main/java/org/jlab/presenter/business/session/UITFPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/UITFPresentationFacade.java index a31fba9..0bbec0e 100644 --- a/src/main/java/org/jlab/presenter/business/session/UITFPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/UITFPresentationFacade.java @@ -1,13 +1,13 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.security.PermitAll; +import jakarta.ejb.Stateless; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; import java.math.BigInteger; import java.util.Date; import java.util.List; -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; import org.jlab.presenter.persistence.entity.UITFPresentation; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/business/session/WeeklyScheduledLogger.java b/src/main/java/org/jlab/presenter/business/session/WeeklyScheduledLogger.java index a960e54..a5f81c3 100644 --- a/src/main/java/org/jlab/presenter/business/session/WeeklyScheduledLogger.java +++ b/src/main/java/org/jlab/presenter/business/session/WeeklyScheduledLogger.java @@ -1,19 +1,19 @@ package org.jlab.presenter.business.session; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.ejb.EJB; +import jakarta.ejb.ScheduleExpression; +import jakarta.ejb.Singleton; +import jakarta.ejb.Startup; +import jakarta.ejb.Timeout; +import jakarta.ejb.Timer; +import jakarta.ejb.TimerService; import java.math.BigInteger; import java.util.Date; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.ejb.ScheduleExpression; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.ejb.Timeout; -import javax.ejb.Timer; -import javax.ejb.TimerService; import org.jlab.presenter.business.util.IOUtil; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.business.util.UrlUtil; diff --git a/src/main/java/org/jlab/presenter/business/util/IOUtil.java b/src/main/java/org/jlab/presenter/business/util/IOUtil.java index 70a7fb4..678f447 100644 --- a/src/main/java/org/jlab/presenter/business/util/IOUtil.java +++ b/src/main/java/org/jlab/presenter/business/util/IOUtil.java @@ -1,5 +1,6 @@ package org.jlab.presenter.business.util; +import jakarta.xml.bind.DatatypeConverter; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.File; @@ -10,7 +11,6 @@ import java.util.Scanner; import java.util.logging.Level; import java.util.logging.Logger; -import javax.xml.bind.DatatypeConverter; public class IOUtil { diff --git a/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java index bb79197..d3c4517 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java index b0dcebc..2446038 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java index 0569a32..d3959fd 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/BodySlide.java b/src/main/java/org/jlab/presenter/persistence/entity/BodySlide.java index 61df3e7..14334f6 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/BodySlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/BodySlide.java @@ -1,13 +1,13 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.BodySlideType; import org.jlab.presenter.persistence.enumeration.SlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/BtaRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/BtaRecord.java index 9628af7..b0899aa 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/BtaRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/BtaRecord.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/BtaShiftInfoSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/BtaShiftInfoSlide.java index 9c64e5b..cb90dc5 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/BtaShiftInfoSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/BtaShiftInfoSlide.java @@ -1,14 +1,14 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/CCPresentation.java b/src/main/java/org/jlab/presenter/persistence/entity/CCPresentation.java index 085a697..9ed237c 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/CCPresentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/CCPresentation.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PresentationType; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/IFrameSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/IFrameSlide.java index e0282a6..adfbfd4 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/IFrameSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/IFrameSlide.java @@ -1,12 +1,12 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.jlab.presenter.persistence.enumeration.SlideType; /** diff --git a/src/main/java/org/jlab/presenter/persistence/entity/ImageSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/ImageSlide.java index bc03466..40181b9 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/ImageSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/ImageSlide.java @@ -1,9 +1,9 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.jlab.presenter.persistence.enumeration.SlideType; /** diff --git a/src/main/java/org/jlab/presenter/persistence/entity/LASOPresentation.java b/src/main/java/org/jlab/presenter/persistence/entity/LASOPresentation.java index 074dda0..feabaf9 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/LASOPresentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/LASOPresentation.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PresentationType; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/LOPresentation.java b/src/main/java/org/jlab/presenter/persistence/entity/LOPresentation.java index f1f20ad..915b76a 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/LOPresentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/LOPresentation.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PresentationType; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PDPresentation.java b/src/main/java/org/jlab/presenter/persistence/entity/PDPresentation.java index 745ae35..5f2ddb8 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PDPresentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PDPresentation.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PDPresentationType; import org.jlab.presenter.persistence.enumeration.PresentationType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PdAccessSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/PdAccessSlide.java index 83e08b7..7f15300 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PdAccessSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PdAccessSlide.java @@ -1,15 +1,15 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.jlab.presenter.persistence.enumeration.SlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PdBeamAccSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/PdBeamAccSlide.java index eff2738..75beac9 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PdBeamAccSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PdBeamAccSlide.java @@ -1,13 +1,13 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; import org.jlab.presenter.persistence.enumeration.SlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PdInfoSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/PdInfoSlide.java index 3c63261..bb1cf50 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PdInfoSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PdInfoSlide.java @@ -1,18 +1,18 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.persistence.enumeration.PdInfoSlideType; import org.jlab.presenter.persistence.enumeration.SlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/Presentation.java b/src/main/java/org/jlab/presenter/persistence/entity/Presentation.java index 4525d1b..637a841 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/Presentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/Presentation.java @@ -1,33 +1,33 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.SequenceGenerator; +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 java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.persistence.enumeration.PresentationType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PresentationLog.java b/src/main/java/org/jlab/presenter/persistence/entity/PresentationLog.java index 630b66c..16d103d 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PresentationLog.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PresentationLog.java @@ -1,14 +1,14 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; import java.io.Serializable; import java.math.BigInteger; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/PresentationLogPK.java b/src/main/java/org/jlab/presenter/persistence/entity/PresentationLogPK.java index 9d05ccb..5eb87fd 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/PresentationLogPK.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/PresentationLogPK.java @@ -1,12 +1,12 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; 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; -import javax.validation.constraints.Size; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java index 0ea6bd9..1f005a1 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Calendar; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.persistence.enumeration.Shift; import org.jlab.presenter.persistence.enumeration.ShiftSlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/Slide.java b/src/main/java/org/jlab/presenter/persistence/entity/Slide.java index 841d1be..d5f3fe2 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/Slide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/Slide.java @@ -1,29 +1,29 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigInteger; import java.util.Objects; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PresentationType; import org.jlab.presenter.persistence.enumeration.SlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/TitleBodyImageSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/TitleBodyImageSlide.java index cc24102..46b10a9 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/TitleBodyImageSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/TitleBodyImageSlide.java @@ -1,10 +1,10 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.jlab.presenter.persistence.enumeration.SlideType; /** diff --git a/src/main/java/org/jlab/presenter/persistence/entity/TitleBodySlide.java b/src/main/java/org/jlab/presenter/persistence/entity/TitleBodySlide.java index 77c0018..1c80376 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/TitleBodySlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/TitleBodySlide.java @@ -1,14 +1,14 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.jlab.presenter.persistence.enumeration.SlideType; import org.jlab.presenter.persistence.enumeration.TitleBodySlideType; diff --git a/src/main/java/org/jlab/presenter/persistence/entity/TitleImageSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/TitleImageSlide.java index a14dbf9..fd77ed6 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/TitleImageSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/TitleImageSlide.java @@ -1,10 +1,10 @@ package org.jlab.presenter.persistence.entity; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; import org.jlab.presenter.persistence.enumeration.SlideType; /** diff --git a/src/main/java/org/jlab/presenter/persistence/entity/UITFPresentation.java b/src/main/java/org/jlab/presenter/persistence/entity/UITFPresentation.java index 5f6ab25..fe2e7ea 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/UITFPresentation.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/UITFPresentation.java @@ -1,19 +1,19 @@ package org.jlab.presenter.persistence.entity; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import org.jlab.presenter.persistence.enumeration.PresentationType; import org.jlab.presenter.persistence.enumeration.Shift; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/CCMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/CCMenu.java index 9d4fcca..36e9437 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/CCMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/CCMenu.java @@ -1,5 +1,12 @@ package org.jlab.presenter.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 jakarta.servlet.http.HttpSession; import java.io.IOException; import java.math.BigInteger; import java.text.ParseException; @@ -8,13 +15,6 @@ import java.util.HashMap; 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 javax.servlet.http.HttpSession; import org.jlab.presenter.business.session.CCPresentationFacade; import org.jlab.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.util.TimeUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/Convert.java b/src/main/java/org/jlab/presenter/presentation/controller/Convert.java index 8157309..6f9aa36 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/Convert.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/Convert.java @@ -1,5 +1,10 @@ package org.jlab.presenter.presentation.controller; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -9,11 +14,6 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * Servlet controller for proxying requests to Puppet Show to allow HTML conversion even for diff --git a/src/main/java/org/jlab/presenter/presentation/controller/DeleteSlide.java b/src/main/java/org/jlab/presenter/presentation/controller/DeleteSlide.java index 1ae8a30..20d4464 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/DeleteSlide.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/DeleteSlide.java @@ -1,16 +1,16 @@ package org.jlab.presenter.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.io.PrintWriter; import java.math.BigInteger; 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.session.PresentationFacade.AuditRecord; import org.jlab.presenter.business.session.SlideFacade; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/ElogHtml.java b/src/main/java/org/jlab/presenter/presentation/controller/ElogHtml.java index 65d6f13..863c1b1 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/ElogHtml.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/ElogHtml.java @@ -1,16 +1,16 @@ package org.jlab.presenter.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.io.PrintWriter; 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/Error.java b/src/main/java/org/jlab/presenter/presentation/controller/Error.java index 1c42616..e9c0c60 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/Error.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/Error.java @@ -1,12 +1,12 @@ package org.jlab.presenter.presentation.controller; +import jakarta.ejb.EJBAccessException; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.ejb.EJBAccessException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author ryans @@ -27,10 +27,10 @@ public class Error extends HttpServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception"); - Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code"); - String servletName = (String) request.getAttribute("javax.servlet.error.servlet_name"); - String requestUri = (String) request.getAttribute("javax.servlet.error.request_uri"); + Throwable throwable = (Throwable) request.getAttribute("jakarta.servlet.error.exception"); + Integer statusCode = (Integer) request.getAttribute("jakarta.servlet.error.status_code"); + String servletName = (String) request.getAttribute("jakarta.servlet.error.servlet_name"); + String requestUri = (String) request.getAttribute("jakarta.servlet.error.request_uri"); String message = "An unknown error has occurred."; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/ImportShiftLogs.java b/src/main/java/org/jlab/presenter/presentation/controller/ImportShiftLogs.java index c9ec452..73953a8 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/ImportShiftLogs.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/ImportShiftLogs.java @@ -1,13 +1,13 @@ package org.jlab.presenter.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 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.presenter.business.exception.WebAppException; import org.jlab.presenter.business.session.CCPresentationFacade; import org.jlab.presenter.business.session.LASOPresentationFacade; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/ImportSummary.java b/src/main/java/org/jlab/presenter/presentation/controller/ImportSummary.java index 84cb677..fae7736 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/ImportSummary.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/ImportSummary.java @@ -1,13 +1,13 @@ package org.jlab.presenter.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 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.presenter.business.session.PDPresentationFacade; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/KeepAlive.java b/src/main/java/org/jlab/presenter/presentation/controller/KeepAlive.java index f2091f9..a67f12c 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/KeepAlive.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/KeepAlive.java @@ -1,17 +1,17 @@ package org.jlab.presenter.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.io.PrintWriter; import java.math.BigInteger; import java.util.List; 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.session.PresentationFacade.AuditRecord; import org.jlab.presenter.business.util.IOUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/LASOMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/LASOMenu.java index b388ae8..133b9d6 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/LASOMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/LASOMenu.java @@ -1,5 +1,12 @@ package org.jlab.presenter.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 jakarta.servlet.http.HttpSession; import java.io.IOException; import java.math.BigInteger; import java.text.ParseException; @@ -8,13 +15,6 @@ import java.util.HashMap; 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 javax.servlet.http.HttpSession; import org.jlab.presenter.business.session.LASOPresentationFacade; import org.jlab.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.util.TimeUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/LOMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/LOMenu.java index 09df488..68670e1 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/LOMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/LOMenu.java @@ -1,5 +1,12 @@ package org.jlab.presenter.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 jakarta.servlet.http.HttpSession; import java.io.IOException; import java.math.BigInteger; import java.text.ParseException; @@ -8,13 +15,6 @@ import java.util.HashMap; 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 javax.servlet.http.HttpSession; import org.jlab.presenter.business.session.LOPresentationFacade; import org.jlab.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.util.TimeUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/Logout.java b/src/main/java/org/jlab/presenter/presentation/controller/Logout.java index 0bd0433..e13c716 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/Logout.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/Logout.java @@ -1,11 +1,11 @@ package org.jlab.presenter.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/presenter/presentation/controller/NewSlide.java b/src/main/java/org/jlab/presenter/presentation/controller/NewSlide.java index 13de9d5..892cc27 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/NewSlide.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/NewSlide.java @@ -1,16 +1,16 @@ package org.jlab.presenter.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.io.PrintWriter; import java.math.BigInteger; 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.session.PresentationFacade.AuditRecord; import org.jlab.presenter.business.session.SlideFacade; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/PDAfternoon.java b/src/main/java/org/jlab/presenter/presentation/controller/PDAfternoon.java index c0de296..e52afbf 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/PDAfternoon.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/PDAfternoon.java @@ -1,15 +1,15 @@ package org.jlab.presenter.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.ParseException; import java.util.Date; -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.presenter.business.session.PDPresentationFacade; import org.jlab.presenter.persistence.enumeration.PDPresentationType; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java index e089d3e..0907459 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java @@ -1,5 +1,12 @@ package org.jlab.presenter.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 jakarta.servlet.http.HttpSession; import java.io.IOException; import java.math.BigInteger; import java.text.ParseException; @@ -11,13 +18,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 javax.servlet.http.HttpSession; import org.jlab.presenter.business.session.*; import org.jlab.presenter.business.util.TimeUtil; import org.jlab.presenter.business.util.UrlUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/PDMorning.java b/src/main/java/org/jlab/presenter/presentation/controller/PDMorning.java index e583a16..728127e 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/PDMorning.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/PDMorning.java @@ -1,15 +1,15 @@ package org.jlab.presenter.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.ParseException; import java.util.Date; -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.presenter.business.session.PDPresentationFacade; import org.jlab.presenter.persistence.enumeration.PDPresentationType; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/Relogin.java b/src/main/java/org/jlab/presenter/presentation/controller/Relogin.java index 13df8e7..e809176 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/Relogin.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/Relogin.java @@ -1,11 +1,11 @@ package org.jlab.presenter.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/presenter/presentation/controller/Resize.java b/src/main/java/org/jlab/presenter/presentation/controller/Resize.java index 020d3b5..36ca7b7 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/Resize.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/Resize.java @@ -1,5 +1,12 @@ package org.jlab.presenter.presentation.controller; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -13,13 +20,6 @@ import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/SSORedirect.java b/src/main/java/org/jlab/presenter/presentation/controller/SSORedirect.java index 7d46028..cf9151e 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/SSORedirect.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/SSORedirect.java @@ -1,11 +1,11 @@ package org.jlab.presenter.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/presenter/presentation/controller/SaveSlide.java b/src/main/java/org/jlab/presenter/presentation/controller/SaveSlide.java index 78255e4..d6fc045 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/SaveSlide.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/SaveSlide.java @@ -1,20 +1,20 @@ package org.jlab.presenter.presentation.controller; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBAccessException; +import jakarta.ejb.EJBException; +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.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; 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.ejb.EJBException; -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.ConstraintViolation; -import javax.validation.ConstraintViolationException; import org.jlab.presenter.business.session.BodySlideFacade; import org.jlab.presenter.business.session.BtaShiftInfoSlideFacade; import org.jlab.presenter.business.session.IFrameSlideFacade; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/SaveSlideOrder.java b/src/main/java/org/jlab/presenter/presentation/controller/SaveSlideOrder.java index ef0a503..9fae63d 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/SaveSlideOrder.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/SaveSlideOrder.java @@ -1,5 +1,11 @@ package org.jlab.presenter.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.io.PrintWriter; import java.math.BigInteger; @@ -9,12 +15,6 @@ import java.util.Map; 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.session.PresentationFacade.AuditRecord; import org.jlab.presenter.business.session.SlideFacade; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/SendToElog.java b/src/main/java/org/jlab/presenter/presentation/controller/SendToElog.java index e4af974..7e9b3bd 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/SendToElog.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/SendToElog.java @@ -1,17 +1,17 @@ package org.jlab.presenter.presentation.controller; +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.presenter.business.exception.WebAppException; import org.jlab.presenter.business.session.PresentationFacade; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/ShowPresentation.java b/src/main/java/org/jlab/presenter/presentation/controller/ShowPresentation.java index bde38f4..fde5297 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/ShowPresentation.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/ShowPresentation.java @@ -1,13 +1,13 @@ package org.jlab.presenter.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 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.presenter.business.session.PresentationFacade; import org.jlab.presenter.persistence.entity.Presentation; import org.jlab.presenter.presentation.util.ConvertAndValidateUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/controller/UITFMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/UITFMenu.java index 18d8780..a392ff8 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/UITFMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/UITFMenu.java @@ -1,16 +1,16 @@ package org.jlab.presenter.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 jakarta.servlet.http.HttpSession; import java.io.IOException; import java.math.BigInteger; import java.text.ParseException; import java.util.*; -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 javax.servlet.http.HttpSession; import org.jlab.presenter.business.session.PresentationFacade; import org.jlab.presenter.business.session.UITFPresentationFacade; import org.jlab.presenter.business.util.TimeUtil; diff --git a/src/main/java/org/jlab/presenter/presentation/filter/CacheFilter.java b/src/main/java/org/jlab/presenter/presentation/filter/CacheFilter.java index 9ecc19e..183e0cf 100644 --- a/src/main/java/org/jlab/presenter/presentation/filter/CacheFilter.java +++ b/src/main/java/org/jlab/presenter/presentation/filter/CacheFilter.java @@ -1,17 +1,17 @@ package org.jlab.presenter.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.IOException; import java.util.Arrays; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/presentation/filter/CharacterEncodingFilter.java b/src/main/java/org/jlab/presenter/presentation/filter/CharacterEncodingFilter.java index 447693a..9cb2842 100644 --- a/src/main/java/org/jlab/presenter/presentation/filter/CharacterEncodingFilter.java +++ b/src/main/java/org/jlab/presenter/presentation/filter/CharacterEncodingFilter.java @@ -1,14 +1,14 @@ package org.jlab.presenter.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; import java.io.IOException; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; @WebFilter( filterName = "CharacterEncodingFilter", diff --git a/src/main/java/org/jlab/presenter/presentation/filter/IPAuthFilter.java b/src/main/java/org/jlab/presenter/presentation/filter/IPAuthFilter.java index a3ec5ca..1be8f06 100644 --- a/src/main/java/org/jlab/presenter/presentation/filter/IPAuthFilter.java +++ b/src/main/java/org/jlab/presenter/presentation/filter/IPAuthFilter.java @@ -1,15 +1,15 @@ package org.jlab.presenter.presentation.filter; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Pattern; -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * A WebFilter that prompts users to authenticate if offsite to view content, but not if onsite or diff --git a/src/main/java/org/jlab/presenter/presentation/filter/LocaleFilter.java b/src/main/java/org/jlab/presenter/presentation/filter/LocaleFilter.java index 564923d..a7b2e94 100644 --- a/src/main/java/org/jlab/presenter/presentation/filter/LocaleFilter.java +++ b/src/main/java/org/jlab/presenter/presentation/filter/LocaleFilter.java @@ -1,16 +1,16 @@ package org.jlab.presenter.presentation.filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.jsp.jstl.core.Config; import java.io.IOException; import java.util.Locale; -import javax.servlet.DispatcherType; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.jsp.jstl.core.Config; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/presentation/filter/PublicProxyFilter.java b/src/main/java/org/jlab/presenter/presentation/filter/PublicProxyFilter.java index a6e7c13..99e1be2 100644 --- a/src/main/java/org/jlab/presenter/presentation/filter/PublicProxyFilter.java +++ b/src/main/java/org/jlab/presenter/presentation/filter/PublicProxyFilter.java @@ -1,11 +1,11 @@ package org.jlab.presenter.presentation.filter; +import jakarta.servlet.*; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.logging.Logger; -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; /** * @author ryans diff --git a/src/main/java/org/jlab/presenter/presentation/util/ConfigurationParameterInit.java b/src/main/java/org/jlab/presenter/presentation/util/ConfigurationParameterInit.java index a7b2e16..4bc913d 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/ConfigurationParameterInit.java +++ b/src/main/java/org/jlab/presenter/presentation/util/ConfigurationParameterInit.java @@ -1,11 +1,11 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; @WebListener public class ConfigurationParameterInit implements ServletContextListener { diff --git a/src/main/java/org/jlab/presenter/presentation/util/ConvertAndValidateUtil.java b/src/main/java/org/jlab/presenter/presentation/util/ConvertAndValidateUtil.java index 011aa10..d26efd5 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/ConvertAndValidateUtil.java +++ b/src/main/java/org/jlab/presenter/presentation/util/ConvertAndValidateUtil.java @@ -1,12 +1,12 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.http.HttpServletRequest; import java.math.BigInteger; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.servlet.http.HttpServletRequest; import org.jlab.presenter.persistence.entity.AccActivityRecord; import org.jlab.presenter.persistence.entity.AccessRecord; import org.jlab.presenter.persistence.entity.BeamToHallRecord; diff --git a/src/main/java/org/jlab/presenter/presentation/util/InternalRequestWrapper.java b/src/main/java/org/jlab/presenter/presentation/util/InternalRequestWrapper.java index 75c7d26..0f8464c 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/InternalRequestWrapper.java +++ b/src/main/java/org/jlab/presenter/presentation/util/InternalRequestWrapper.java @@ -1,13 +1,13 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; public class InternalRequestWrapper extends HttpServletRequestWrapper { diff --git a/src/main/java/org/jlab/presenter/presentation/util/InternalResponseWrapper.java b/src/main/java/org/jlab/presenter/presentation/util/InternalResponseWrapper.java index 6d923dc..dd593ae 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/InternalResponseWrapper.java +++ b/src/main/java/org/jlab/presenter/presentation/util/InternalResponseWrapper.java @@ -1,13 +1,13 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; public class InternalResponseWrapper extends HttpServletResponseWrapper { diff --git a/src/main/java/org/jlab/presenter/presentation/util/PresentationMenuUtil.java b/src/main/java/org/jlab/presenter/presentation/util/PresentationMenuUtil.java index cc7e06f..6acbd2a 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/PresentationMenuUtil.java +++ b/src/main/java/org/jlab/presenter/presentation/util/PresentationMenuUtil.java @@ -1,5 +1,7 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; @@ -15,8 +17,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.jlog.exception.AttachmentSizeException; import org.jlab.jlog.exception.InvalidXMLException; import org.jlab.jlog.exception.LogCertificateException; diff --git a/src/main/java/org/jlab/presenter/presentation/util/SlideUtil.java b/src/main/java/org/jlab/presenter/presentation/util/SlideUtil.java index bd2ba3c..18dfeb9 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/SlideUtil.java +++ b/src/main/java/org/jlab/presenter/presentation/util/SlideUtil.java @@ -1,9 +1,9 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.http.HttpServletRequest; import java.text.ParseException; import java.util.Date; import java.util.List; -import javax.servlet.http.HttpServletRequest; import org.jlab.presenter.persistence.entity.AccActivityRecord; import org.jlab.presenter.persistence.entity.AccessRecord; import org.jlab.presenter.persistence.entity.BeamToHallRecord; diff --git a/src/main/java/org/jlab/presenter/presentation/util/TemplateExecutor.java b/src/main/java/org/jlab/presenter/presentation/util/TemplateExecutor.java index 7915082..33caf73 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/TemplateExecutor.java +++ b/src/main/java/org/jlab/presenter/presentation/util/TemplateExecutor.java @@ -1,9 +1,9 @@ package org.jlab.presenter.presentation.util; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.jlab.presenter.persistence.entity.Slide; public class TemplateExecutor { diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 34c9904..232c4b0 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -10,7 +10,6 @@ - diff --git a/src/main/webapp/WEB-INF/functions.tld b/src/main/webapp/WEB-INF/functions.tld index 4afcf4f..b7aecec 100644 --- a/src/main/webapp/WEB-INF/functions.tld +++ b/src/main/webapp/WEB-INF/functions.tld @@ -1,9 +1,9 @@ - + Custom Functions 1.0 presenter diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml deleted file mode 100644 index 18b20f3..0000000 --- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log-overflow.jsp b/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log-overflow.jsp index cd81eee..571ae36 100644 --- a/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log-overflow.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log-overflow.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
CEBAF SHIFT LOG
diff --git a/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log.jsp b/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log.jsp index 4ae7222..a217009 100644 --- a/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/cebaf-shift-log.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%>
CEBAF SHIFT LOG
diff --git a/src/main/webapp/WEB-INF/slide-templates/date-iframe.jsp b/src/main/webapp/WEB-INF/slide-templates/date-iframe.jsp index bc0e0cb..1e62e43 100644 --- a/src/main/webapp/WEB-INF/slide-templates/date-iframe.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/date-iframe.jsp @@ -1,6 +1,6 @@ <%@ page 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" %>
Click to add url
diff --git a/src/main/webapp/WEB-INF/slide-templates/iframe.jsp b/src/main/webapp/WEB-INF/slide-templates/iframe.jsp index d0dcd81..4c3feb1 100644 --- a/src/main/webapp/WEB-INF/slide-templates/iframe.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/iframe.jsp @@ -1,6 +1,6 @@ <%@ page 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" %>
Click to add url
diff --git a/src/main/webapp/WEB-INF/slide-templates/image.jsp b/src/main/webapp/WEB-INF/slide-templates/image.jsp index cb7e17f..60b4182 100644 --- a/src/main/webapp/WEB-INF/slide-templates/image.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/image.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/laso-shift-log.jsp b/src/main/webapp/WEB-INF/slide-templates/laso-shift-log.jsp index 1dab94f..fa24ece 100644 --- a/src/main/webapp/WEB-INF/slide-templates/laso-shift-log.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/laso-shift-log.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> <%@taglib prefix="hco" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/lo-shift-log.jsp b/src/main/webapp/WEB-INF/slide-templates/lo-shift-log.jsp index e4651b6..c46e13a 100644 --- a/src/main/webapp/WEB-INF/slide-templates/lo-shift-log.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/lo-shift-log.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> <%@taglib prefix="hco" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/pd-shift-summary.jsp b/src/main/webapp/WEB-INF/slide-templates/pd-shift-summary.jsp index df91e11..0aa1865 100644 --- a/src/main/webapp/WEB-INF/slide-templates/pd-shift-summary.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/pd-shift-summary.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> <%@taglib prefix="hco" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/pd-summary-overflow.jsp b/src/main/webapp/WEB-INF/slide-templates/pd-summary-overflow.jsp index ac9b261..f97cfb6 100644 --- a/src/main/webapp/WEB-INF/slide-templates/pd-summary-overflow.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/pd-summary-overflow.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
PD WEEKLY SUMMARY
diff --git a/src/main/webapp/WEB-INF/slide-templates/sum1.jsp b/src/main/webapp/WEB-INF/slide-templates/sum1.jsp index 02e5193..f79fec5 100644 --- a/src/main/webapp/WEB-INF/slide-templates/sum1.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/sum1.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%>
PD WEEKLY SUMMARY
diff --git a/src/main/webapp/WEB-INF/slide-templates/sum2-1.jsp b/src/main/webapp/WEB-INF/slide-templates/sum2-1.jsp index 2ad9cc4..af7f937 100644 --- a/src/main/webapp/WEB-INF/slide-templates/sum2-1.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/sum2-1.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%>
PD WEEKLY SUMMARY
diff --git a/src/main/webapp/WEB-INF/slide-templates/sum2-2.jsp b/src/main/webapp/WEB-INF/slide-templates/sum2-2.jsp index 1a47179..d1f385e 100644 --- a/src/main/webapp/WEB-INF/slide-templates/sum2-2.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/sum2-2.jsp @@ -1,7 +1,7 @@ <%@ page 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="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="p" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/sum2-3.jsp b/src/main/webapp/WEB-INF/slide-templates/sum2-3.jsp index fe634f5..bd19119 100644 --- a/src/main/webapp/WEB-INF/slide-templates/sum2-3.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/sum2-3.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> <%@taglib prefix="p" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/sum2-4.jsp b/src/main/webapp/WEB-INF/slide-templates/sum2-4.jsp index 3993298..40712ea 100644 --- a/src/main/webapp/WEB-INF/slide-templates/sum2-4.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/sum2-4.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
PD WEEKLY SUMMARY
diff --git a/src/main/webapp/WEB-INF/slide-templates/title-dynamic-two-columns.jsp b/src/main/webapp/WEB-INF/slide-templates/title-dynamic-two-columns.jsp index 9f63061..6a18ccd 100644 --- a/src/main/webapp/WEB-INF/slide-templates/title-dynamic-two-columns.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/title-dynamic-two-columns.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/title-image.jsp b/src/main/webapp/WEB-INF/slide-templates/title-image.jsp index c597ce6..10e3f4e 100644 --- a/src/main/webapp/WEB-INF/slide-templates/title-image.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/title-image.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/title-text-image.jsp b/src/main/webapp/WEB-INF/slide-templates/title-text-image.jsp index b477cfe..c38f9e0 100644 --- a/src/main/webapp/WEB-INF/slide-templates/title-text-image.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/title-text-image.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/title-text.jsp b/src/main/webapp/WEB-INF/slide-templates/title-text.jsp index 430c254..20c358c 100644 --- a/src/main/webapp/WEB-INF/slide-templates/title-text.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/title-text.jsp @@ -1,6 +1,6 @@ <%@ page 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"%>
diff --git a/src/main/webapp/WEB-INF/slide-templates/uitf-shift-log.jsp b/src/main/webapp/WEB-INF/slide-templates/uitf-shift-log.jsp index 836d93b..8830c2c 100644 --- a/src/main/webapp/WEB-INF/slide-templates/uitf-shift-log.jsp +++ b/src/main/webapp/WEB-INF/slide-templates/uitf-shift-log.jsp @@ -1,7 +1,7 @@ <%@ page pageEncoding="UTF-8" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> <%@taglib prefix="hco" uri="http://jlab.org/presenter/functions"%>
diff --git a/src/main/webapp/WEB-INF/tags/page.tag b/src/main/webapp/WEB-INF/tags/page.tag index 528db72..0dfb156 100644 --- a/src/main/webapp/WEB-INF/tags/page.tag +++ b/src/main/webapp/WEB-INF/tags/page.tag @@ -1,11 +1,11 @@ <%@tag description="The Site Page Template 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"%> <%@attribute name="title"%> <%@attribute name="stylesheets" fragment="true"%> <%@attribute name="scripts" fragment="true"%> - - + + diff --git a/src/main/webapp/WEB-INF/views/cc-menu.jsp b/src/main/webapp/WEB-INF/views/cc-menu.jsp index 3433e8e..e8ba5cc 100644 --- a/src/main/webapp/WEB-INF/views/cc-menu.jsp +++ b/src/main/webapp/WEB-INF/views/cc-menu.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/error.jsp b/src/main/webapp/WEB-INF/views/error.jsp index 2bc4fc4..01ed2b9 100644 --- a/src/main/webapp/WEB-INF/views/error.jsp +++ b/src/main/webapp/WEB-INF/views/error.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/laso-menu.jsp b/src/main/webapp/WEB-INF/views/laso-menu.jsp index 4caae74..4f3db8a 100644 --- a/src/main/webapp/WEB-INF/views/laso-menu.jsp +++ b/src/main/webapp/WEB-INF/views/laso-menu.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/lo-menu.jsp b/src/main/webapp/WEB-INF/views/lo-menu.jsp index 8585f9f..acd9df5 100644 --- a/src/main/webapp/WEB-INF/views/lo-menu.jsp +++ b/src/main/webapp/WEB-INF/views/lo-menu.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/pd-menu.jsp b/src/main/webapp/WEB-INF/views/pd-menu.jsp index 51d043b..ca347f4 100644 --- a/src/main/webapp/WEB-INF/views/pd-menu.jsp +++ b/src/main/webapp/WEB-INF/views/pd-menu.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/presentation.jsp b/src/main/webapp/WEB-INF/views/presentation.jsp index f0f7e4e..615a50f 100644 --- a/src/main/webapp/WEB-INF/views/presentation.jsp +++ b/src/main/webapp/WEB-INF/views/presentation.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="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="p" uri="http://jlab.org/presenter/functions"%> - + diff --git a/src/main/webapp/WEB-INF/views/relogin.jsp b/src/main/webapp/WEB-INF/views/relogin.jsp index 64c025c..11be1a4 100644 --- a/src/main/webapp/WEB-INF/views/relogin.jsp +++ b/src/main/webapp/WEB-INF/views/relogin.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/views/uitf-menu.jsp b/src/main/webapp/WEB-INF/views/uitf-menu.jsp index cf9083c..5f1271f 100644 --- a/src/main/webapp/WEB-INF/views/uitf-menu.jsp +++ b/src/main/webapp/WEB-INF/views/uitf-menu.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="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index eab709a..4ba25cd 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"> pd-menu From 59c84b66878979158fec06e9362050a64621bf19 Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Tue, 23 Dec 2025 16:39:18 -0500 Subject: [PATCH 2/3] Hibernate 6 refuses scale on Float --- .../persistence/entity/AccActivityRecord.java | 4 ++-- .../presenter/persistence/entity/AccessRecord.java | 10 +++++----- .../presenter/persistence/entity/BeamToHallRecord.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java index d3c4517..c6f14ac 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/AccActivityRecord.java @@ -43,10 +43,10 @@ public class AccActivityRecord implements Serializable { @Column(name = "ACTIVITY_TYPE", length = 36) private String activityType; - @Column(name = "SCHEDULED", precision = 12, scale = 4) + @Column(name = "SCHEDULED", precision = 12) private Float scheduled; - @Column(name = "ACTUAL", precision = 12, scale = 4) + @Column(name = "ACTUAL", precision = 12) private Float actual; @JoinColumn(name = "SLIDE_ID", referencedColumnName = "SLIDE_ID") diff --git a/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java index 2446038..0db0ad8 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/AccessRecord.java @@ -40,19 +40,19 @@ public class AccessRecord implements Serializable { @Column(name = "ACCESS_TYPE", length = 64) private String accessType; - @Column(name = "HALL_A", precision = 12, scale = 4) + @Column(name = "HALL_A", precision = 12) private Float hallA; - @Column(name = "HALL_B", precision = 12, scale = 4) + @Column(name = "HALL_B", precision = 12) private Float hallB; - @Column(name = "HALL_C", precision = 12, scale = 4) + @Column(name = "HALL_C", precision = 12) private Float hallC; - @Column(name = "HALL_D", precision = 12, scale = 4) + @Column(name = "HALL_D", precision = 12) private Float hallD; - @Column(name = "ACCEL", precision = 12, scale = 4) + @Column(name = "ACCEL", precision = 12) private Float accel; @JoinColumn(name = "SLIDE_ID", referencedColumnName = "SLIDE_ID") diff --git a/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java b/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java index d3959fd..1a4f892 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/BeamToHallRecord.java @@ -43,19 +43,19 @@ public class BeamToHallRecord implements Serializable { @Column(name = "HALL", length = 12) private String hall; - @Column(name = "SCHEDULED", precision = 12, scale = 4) + @Column(name = "SCHEDULED", precision = 12) private Float scheduled; - @Column(name = "ACC_AVAIL", precision = 12, scale = 4) + @Column(name = "ACC_AVAIL", precision = 12) private Float accAvail; - @Column(name = "ACCEPT", precision = 12, scale = 4) + @Column(name = "ACCEPT", precision = 12) private Float accept; - @Column(name = "HALL_AVAIL", precision = 12, scale = 4) + @Column(name = "HALL_AVAIL", precision = 12) private Float hallAvail; - @Column(name = "ACTUAL", precision = 12, scale = 4) + @Column(name = "ACTUAL", precision = 12) private Float actual; @JoinColumn(name = "SLIDE_ID", referencedColumnName = "SLIDE_ID") From 89a0df6e585b4ead5abd3e8bbd90119987d9488b Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Tue, 23 Dec 2025 16:44:11 -0500 Subject: [PATCH 3/3] Hibernate 6 refuses hand wavy time arithmetic --- .../jlab/presenter/business/session/PDPresentationFacade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java b/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java index 326d668..ceb59bb 100644 --- a/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java +++ b/src/main/java/org/jlab/presenter/business/session/PDPresentationFacade.java @@ -246,7 +246,7 @@ public List getIncomingSlides( public List findRecent() { TypedQuery q = em.createQuery( - "select p from PDPresentation p where p.deliveryYmd > sysdate - 8 order by p.deliveryYmd desc, p.pdPresentationType desc", + "select p from PDPresentation p where p.deliveryYmd > (current_timestamp - 8 day) order by p.deliveryYmd desc, p.pdPresentationType desc", PDPresentation.class); return q.getResultList();