Index: eprms-model/pom.xml =================================================================== --- eprms-model/pom.xml (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-model/pom.xml (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -6,5 +6,5 @@ info.ajanovski.eprms model - 0.0.11-SNAPSHOT + 0.0.12-SNAPSHOT EPRMS - Educational Project and Resource Management System - Model @@ -26,7 +26,7 @@ - 17 - 17 - 17 + 21 + 21 + 21 UTF-8 Index: eprms-tap/pom.xml =================================================================== --- eprms-tap/pom.xml (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/pom.xml (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -1,11 +1,12 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" +> 4.0.0 org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.1.3 @@ -13,5 +14,5 @@ info.ajanovski.eprms eprms-tap - 0.0.13-SNAPSHOT + 0.0.14-SNAPSHOT-jakarta EPRMS - Educational Project and Resource Management System @@ -36,21 +37,22 @@ UTF-8 - 3.12.1 - 3.2.3 - 17 - 17 - 17 - - 2.7.18 - 5.8.4 - 2.13.5 - 2.23.0 - 5.10.2 - 3.0.3 - 4.0.1 + 3.13.0 + 3.5.0 + 3.0.0 + 21 + 21 + 21 + + 3.1.3 + 5.9.0-preview-2 + 2.13.1 + 2.24.0 + 5.8.2 + 2.0.4 + 5.0.0 1.1.4 - 42.7.2 - 3.6.4 + 42.7.4 + 4.0.4 @@ -67,10 +69,10 @@ info.ajanovski.eprms model - 0.0.11-SNAPSHOT + 0.0.12-SNAPSHOT info.ajanovski.eprms mq - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT @@ -114,5 +116,5 @@ org.apache.tapestry - tapestry-core + tapestry-core-jakarta ${tapestry-version} compile @@ -121,5 +123,5 @@ org.apache.tapestry - tapestry-webresources + tapestry-webresources-jakarta ${tapestry-version} compile @@ -130,5 +132,5 @@ org.apache.tapestry - tapestry-spring + tapestry-spring-jakarta ${tapestry-version} compile @@ -137,5 +139,5 @@ org.apache.tapestry - tapestry-hibernate + tapestry-hibernate-jakarta ${tapestry-version} compile @@ -149,5 +151,5 @@ org.apache.tapestry - tapestry-upload + tapestry-upload-jakarta ${tapestry-version} compile @@ -156,5 +158,5 @@ org.apache.tapestry - tapestry-test + tapestry-test-jakarta ${tapestry-version} test @@ -203,6 +205,6 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet-version} provided @@ -218,14 +220,14 @@ com.zaxxer HikariCP - 5.1.0 + 6.2.1 org.hibernate hibernate-hikaricp - 5.6.15.Final - - - - org.jasig.cas.client + 5.4.33.Final + + + + org.apereo.cas.client cas-client-core ${cas-client-version} @@ -242,5 +244,5 @@ org.webjars webjars-locator - 0.48 + 0.52 @@ -264,6 +266,28 @@ 1.205.0 - + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.9 + + + + + + org.hibernate.orm + hibernate-core + 5.4.33.Final + + + @@ -331,5 +355,5 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + ${maven-enforcer-version} @@ -404,5 +428,6 @@ jar META-INF/resources/webjars/**/* - ${project.basedir}/target/classes/META-INF/assets/ + + ${project.basedir}/target/classes/META-INF/assets/ @@ -411,5 +436,6 @@ jar META-INF/resources/webjars/**/* - ${project.basedir}/target/classes/META-INF/assets/ + + ${project.basedir}/target/classes/META-INF/assets/ @@ -418,5 +444,6 @@ jar META-INF/resources/webjars/**/* - ${project.basedir}/target/classes/META-INF/assets/ + + ${project.basedir}/target/classes/META-INF/assets/ @@ -425,5 +452,6 @@ jar META-INF/resources/webjars/**/* - ${project.basedir}/target/classes/META-INF/assets/ + + ${project.basedir}/target/classes/META-INF/assets/ Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/AppConfiguration.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -23,19 +23,13 @@ import java.util.EnumSet; -import javax.servlet.DispatcherType; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.SessionTrackingMode; - import org.apache.tapestry5.TapestryFilter; -import org.jasig.cas.client.authentication.AuthenticationFilter; -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.session.SingleSignOutHttpSessionListener; -import org.jasig.cas.client.util.HttpServletRequestWrapperFilter; -import org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +import org.apereo.cas.client.authentication.AuthenticationFilter; +import org.apereo.cas.client.session.SingleSignOutFilter; +import org.apereo.cas.client.session.SingleSignOutHttpSessionListener; +import org.apereo.cas.client.util.HttpServletRequestWrapperFilter; +import org.apereo.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter; import org.springframework.boot.web.server.ErrorPage; +import org.springframework.boot.web.server.ErrorPageRegistrar; import org.springframework.boot.web.servlet.ServletContextInitializer; -import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -45,4 +39,8 @@ import info.ajanovski.eprms.tap.util.AppConfig; import info.ajanovski.eprms.tap.util.UTF8Filter; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.SessionTrackingMode; @Configuration @@ -59,4 +57,5 @@ "info.ajanovski.eprms.tap.services.DevelopmentModule"); servletContext.setInitParameter("tapestry.qa-modules", "info.ajanovski.eprms.tap.services.QaModule"); + //servletContext.setInitParameter("tapestry.use-external-spring-context", "true"); servletContext.setInitParameter("artifactParameterName", "ticket"); @@ -89,4 +88,6 @@ servletContext.addListener(SingleSignOutHttpSessionListener.class); + //servletContext.addFilter("app", TapestrySpringFilter.class).addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR), false, "/*"); + servletContext.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); } @@ -94,10 +95,17 @@ } - @Bean - public ConfigurableServletWebServerFactory webServerFactory() { - TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); - factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); - return factory; - } + @Bean + public ErrorPageRegistrar errorPageRegistrar() { + return registry -> { + registry.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); + }; + } + + // @Bean +// public ConfigurableServletWebServerFactory webServerFactory() { +// TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); +// factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/error404")); +// return factory; +// } // @Bean(name = "messageSource") Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/components/ModalBox.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -3,5 +3,4 @@ //Based on http://readyareyou.blogspot.com.au/2012/11/tapestry5-bootstrap-modal-dialog.html . -import javax.inject.Inject; import org.apache.tapestry5.BindingConstants; @@ -10,8 +9,10 @@ import org.apache.tapestry5.annotations.Parameter; import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; import org.apache.tapestry5.services.ajax.JavaScriptCallback; import org.apache.tapestry5.services.javascript.JavaScriptSupport; + @Import(module = { "ModalBox" }) Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDaoImpl.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/PersonDaoImpl.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -24,9 +24,8 @@ import java.util.List; -import javax.persistence.Query; - import org.apache.tapestry5.ioc.annotations.Inject; import org.hibernate.Session; import org.hibernate.exception.DataException; +import org.hibernate.query.Query; import org.slf4j.Logger; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/data/ProjectDaoImpl.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -24,6 +24,5 @@ import java.util.List; -import javax.inject.Inject; - +import org.apache.tapestry5.ioc.annotations.Inject; import org.hibernate.Session; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -2,6 +2,4 @@ import java.util.List; - -import javax.inject.Inject; import org.apache.tapestry5.SelectModel; @@ -11,4 +9,5 @@ import org.apache.tapestry5.corelib.components.Zone; import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.SelectModelFactory; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -2,6 +2,4 @@ import java.util.List; - -import javax.inject.Inject; import org.apache.tapestry5.SelectModel; @@ -12,4 +10,5 @@ import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.SelectModelFactory; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManagePersons.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManagePersons.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManagePersons.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -3,6 +3,4 @@ import java.util.List; import java.util.stream.Collectors; - -import javax.inject.Inject; import org.apache.tapestry5.SelectModel; @@ -13,4 +11,5 @@ import org.apache.tapestry5.corelib.components.Form; import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.SelectModelFactory; import org.slf4j.Logger; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProfile.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProfile.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProfile.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -21,10 +21,9 @@ package info.ajanovski.eprms.tap.pages.user; -import javax.inject.Inject; - import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; import org.apache.tapestry5.hibernate.annotations.CommitAfter; +import org.apache.tapestry5.ioc.annotations.Inject; import info.ajanovski.eprms.model.entities.Person; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjectReports.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -3,6 +3,4 @@ import java.util.Date; import java.util.List; - -import javax.inject.Inject; import org.apache.tapestry5.annotations.Import; @@ -14,4 +12,5 @@ import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; import org.slf4j.Logger; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjects.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjects.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/user/MyProjects.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -6,6 +6,4 @@ import java.util.List; import java.util.stream.Collectors; - -import javax.inject.Inject; import org.apache.tapestry5.SelectModel; @@ -18,4 +16,5 @@ import org.apache.tapestry5.hibernate.annotations.CommitAfter; import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.SelectModelFactory; import org.apache.tapestry5.services.ajax.AjaxResponseRenderer; @@ -39,5 +38,4 @@ import info.ajanovski.eprms.tap.services.ProjectManager; import info.ajanovski.eprms.tap.services.SystemConfigService; -import info.ajanovski.eprms.tap.util.AppConstants; import info.ajanovski.eprms.tap.util.UserInfo; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/AppModule.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -49,4 +49,5 @@ import org.apache.tapestry5.services.ComponentRequestFilter; import org.apache.tapestry5.services.ComponentSource; +import org.apache.tapestry5.services.ExceptionReporter; import org.apache.tapestry5.services.PersistentLocale; import org.hibernate.Session; @@ -194,5 +195,4 @@ userInfo.setUserRoles(userRoles); logger.debug("userInfo is now initialized"); - } @@ -201,5 +201,5 @@ } catch (Exception e) { if (userInfo.getUserName() != null) { - logger.error("userName {} is not found", userInfo.getUserName()); + logger.error("userName {} is not found {}", userInfo.getUserName(), e); } else { logger.error("userName is empty"); @@ -222,5 +222,5 @@ public static void provideBeanValidatorConfigurer(OrderedConfiguration configuration) { configuration.add("noXMLBeanValidatorConfigurer", new BeanValidatorConfigurer() { - public void configure(javax.validation.Configuration configuration) { + public void configure(jakarta.validation.Configuration configuration) { configuration.ignoreXmlConfiguration(); } @@ -232,3 +232,17 @@ } + /** + * By default, Tapestry's ExceptionReporter implementation writes verbose text + * files to the "build/exceptions" directory. This replaces that implementation + * with one that does nothing. (The exceptions still get logged elsewhere.) + */ + @Decorate(serviceInterface = ExceptionReporter.class) + public static ExceptionReporter preventExceptionFileWriting(final ExceptionReporter exceptionReporter) { + return new ExceptionReporter() { + @Override + public void reportException(Throwable exception) { + } + }; + } + } Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/services/ProjectManagerImpl.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -27,5 +27,5 @@ import java.util.stream.Collectors; -import javax.inject.Inject; +import org.apache.tapestry5.ioc.annotations.Inject; import info.ajanovski.eprms.model.entities.Activity; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/AppConfig.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -5,6 +5,5 @@ import java.util.ResourceBundle; -import javax.inject.Inject; - +import org.apache.tapestry5.ioc.annotations.Inject; import org.slf4j.Logger; Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java =================================================================== --- eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java (revision c8c70ae428c82b4b43133a0bfdca5e92baf2f2c2) +++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/util/UTF8Filter.java (revision ca4cdc149e6cd5f671baa2f6a000db64c909dcbe) @@ -23,10 +23,10 @@ import java.io.IOException; -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 jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class UTF8Filter implements Filter {