This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba99b070e4adb0ac65abfae348632090e484dc72 Author: Andi Huber <[email protected]> AuthorDate: Sun Nov 13 10:49:39 2022 +0100 ISIS-3275: migrate webapp and security --- .../core/config/CausewayConfiguration.java | 4 ++-- .../core/config/RestEasyConfiguration.java | 2 +- core/security/src/main/java/module-info.java | 4 ++-- .../security/authentication/logout/LogoutMenu.java | 6 +++--- .../manager/AuthenticationManager.java | 6 +++--- .../standard/RandomCodeGeneratorDefault.java | 4 ++-- .../manager/AuthorizationManager.java | 6 +++--- core/webapp/pom.xml | 4 ++-- core/webapp/src/main/java/module-info.java | 6 +++--- .../confmenu/ConfigurationViewServiceDefault.java | 8 ++++---- .../HealthIndicatorUsingHealthCheckService.java | 4 ++-- .../KeyValueStoreUsingHttpSession.java | 7 +++---- .../causeway/core/webapp/modules/WebModule.java | 14 +++++++------- .../core/webapp/modules/WebModuleAbstract.java | 14 +++++++------- .../core/webapp/modules/WebModuleContext.java | 8 ++++---- .../logonlog/CausewayLogOnExceptionFilter.java | 14 +++++++------- .../logonlog/WebModuleLogOnExceptionLogger.java | 12 ++++++------ .../TemplateResourceCachingFilter.java | 22 +++++++++++----------- .../templresources/TemplateResourceServlet.java | 10 +++++----- .../templresources/WebModuleTemplateResources.java | 12 ++++++------ .../core/webapp/modules/templresources/_Util.java | 2 +- .../core/webapp/routing/ForwardingServlet.java | 10 +++++----- .../core/webapp/routing/RedirectFilter.java | 16 ++++++++-------- .../core/webapp/routing/RedirectServlet.java | 10 +++++----- .../core/webapp/routing/RedirectToDocsFilter.java | 16 ++++++++-------- .../CausewayWebAppContextInitializer.java | 10 +++++----- 26 files changed, 115 insertions(+), 116 deletions(-) diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java index c08092974b..77f6752504 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java @@ -2093,8 +2093,8 @@ public class CausewayConfiguration { private boolean suppressUpdateLink = false; /** - * If left unset (the default), then the RO viewer will use the {@link javax.ws.rs.core.UriInfo} - * (injected using {@link javax.ws.rs.core.Context}) to figure out the base Uri (used to render + * If left unset (the default), then the RO viewer will use the {@link jakarta.ws.rs.core.UriInfo} + * (injected using {@link jakarta.ws.rs.core.Context}) to figure out the base Uri (used to render * <code>href</code>s). * * <p> diff --git a/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java index 7e654e92da..a44c0670d6 100644 --- a/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java +++ b/core/config/src/main/java/org/apache/causeway/core/config/RestEasyConfiguration.java @@ -48,7 +48,7 @@ public class RestEasyConfiguration { * * <p> * Note that this is used rather than <code>resteasy.servlet.mapping.prefix</code> - * because there is <i>NO</i> implementation of {@link javax.ws.rs.core.Application}, so we rely on it being + * because there is <i>NO</i> implementation of {@link jakarta.ws.rs.core.Application}, so we rely on it being * automatically created. * </p> * diff --git a/core/security/src/main/java/module-info.java b/core/security/src/main/java/module-info.java index 41e034b5bc..f5153e947b 100644 --- a/core/security/src/main/java/module-info.java +++ b/core/security/src/main/java/module-info.java @@ -31,9 +31,9 @@ module org.apache.causeway.security.api { exports org.apache.causeway.core.security.authorization; exports org.apache.causeway.core.security.util; - requires java.annotation; + requires jakarta.annotation; requires java.desktop; - requires java.inject; + requires jakarta.inject; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java index ba4dead7a5..1acc5dfb09 100644 --- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java +++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/logout/LogoutMenu.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.security.authentication.logout; import java.util.List; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.apache.causeway.applib.CausewayModuleApplib; import org.apache.causeway.applib.annotation.Action; @@ -50,7 +50,7 @@ import lombok.val; @DomainServiceLayout( menuBar = DomainServiceLayout.MenuBar.TERTIARY ) [email protected](PriorityPrecedence.EARLY) [email protected](PriorityPrecedence.EARLY) @RequiredArgsConstructor(onConstructor_ = {@Inject}) public class LogoutMenu { diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java index e83ba11dba..e438d057c0 100644 --- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java +++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/manager/AuthenticationManager.java @@ -22,9 +22,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java index aedca38f3b..d7df2a75b7 100644 --- a/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java +++ b/core/security/src/main/java/org/apache/causeway/core/security/authentication/standard/RandomCodeGeneratorDefault.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.security.authentication.standard; import java.security.SecureRandom; -import javax.annotation.Priority; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java index cbf04f1b89..7c1e5694a0 100644 --- a/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java +++ b/core/security/src/main/java/org/apache/causeway/core/security/authorization/manager/AuthorizationManager.java @@ -21,9 +21,9 @@ package org.apache.causeway.core.security.authorization.manager; import java.util.List; import java.util.Optional; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.lang.Nullable; diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml index 5290bfc6ed..fd66f0ffea 100644 --- a/core/webapp/pom.xml +++ b/core/webapp/pom.xml @@ -96,8 +96,8 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> <scope>compile</scope> <!-- compile: makes it transitive --> </dependency> diff --git a/core/webapp/src/main/java/module-info.java b/core/webapp/src/main/java/module-info.java index dd0c991c84..af1649c2b5 100644 --- a/core/webapp/src/main/java/module-info.java +++ b/core/webapp/src/main/java/module-info.java @@ -27,9 +27,9 @@ module org.apache.causeway.core.webapp { exports org.apache.causeway.core.webapp.routing; exports org.apache.causeway.core.webapp.webappctx; - requires java.annotation; - requires java.inject; - requires javax.servlet.api; + requires jakarta.annotation; + requires jakarta.inject; + requires jakarta.servlet; requires lombok; requires org.apache.causeway.applib; requires org.apache.causeway.commons; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java index 2f0a893654..0bc2e131d0 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/confmenu/ConfigurationViewServiceDefault.java @@ -27,10 +27,10 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.Priority; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Priority; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.env.Environment; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java index 4fd86b1779..61abc7b2dc 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/health/HealthIndicatorUsingHealthCheckService.java @@ -20,8 +20,8 @@ package org.apache.causeway.core.webapp.health; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.inject.Inject; +import jakarta.inject.Named; import org.springframework.boot.actuate.health.AbstractHealthIndicator; import org.springframework.boot.actuate.health.Health; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java index 39b13d455c..2454334288 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/keyvaluestore/KeyValueStoreUsingHttpSession.java @@ -21,9 +21,6 @@ package org.apache.causeway.core.webapp.keyvaluestore; import java.io.Serializable; import java.util.Optional; -import javax.inject.Named; -import javax.servlet.http.HttpSession; - import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; @@ -32,6 +29,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.services.keyvaluestore.KeyValueSessionStore; +import jakarta.inject.Named; +import jakarta.servlet.http.HttpSession; import lombok.NonNull; /** @@ -42,7 +41,7 @@ import lombok.NonNull; */ @Component @Named("causeway.webapp.KeyValueStoreUsingHttpSession") [email protected](PriorityPrecedence.MIDPOINT) [email protected](PriorityPrecedence.MIDPOINT) public class KeyValueStoreUsingHttpSession implements KeyValueSessionStore { @Override diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModule.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModule.java index 7e734611c8..76eb922bf1 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModule.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModule.java @@ -18,13 +18,13 @@ */ package org.apache.causeway.core.webapp.modules; -import javax.annotation.Priority; -import javax.servlet.Filter; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebListener; +import jakarta.annotation.Priority; +import jakarta.servlet.Filter; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.WebListener; import org.springframework.core.annotation.Order; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleAbstract.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleAbstract.java index df410851a7..69b78d95c6 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleAbstract.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleAbstract.java @@ -20,13 +20,13 @@ package org.apache.causeway.core.webapp.modules; import java.util.Optional; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; import org.apache.causeway.applib.services.inject.ServiceInjector; import org.apache.causeway.commons.internal.factory._InstanceUtil; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java index 2bee0dba6c..c02a9282b1 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/WebModuleContext.java @@ -21,10 +21,10 @@ package org.apache.causeway.core.webapp.modules; import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; import org.apache.causeway.applib.services.registry.ServiceRegistry; import org.apache.causeway.commons.collections.Can; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/CausewayLogOnExceptionFilter.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/CausewayLogOnExceptionFilter.java index 500efd975e..21c5398220 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/CausewayLogOnExceptionFilter.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/CausewayLogOnExceptionFilter.java @@ -20,13 +20,13 @@ package org.apache.causeway.core.webapp.modules.logonlog; 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 javax.servlet.http.HttpServletRequest; +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.http.HttpServletRequest; import lombok.val; //import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java index 5be3cf2887..90a7912ef0 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.core.webapp.modules.logonlog; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ import lombok.Getter; */ @Service @Named("causeway.webapp.WebModuleLogOnExceptionLogger") [email protected](PriorityPrecedence.EARLY - 100) [email protected](PriorityPrecedence.EARLY - 100) @Qualifier("LogOnExceptionLogger") public final class WebModuleLogOnExceptionLogger extends WebModuleAbstract { diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceCachingFilter.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceCachingFilter.java index 8f26a1a43d..d5fdf86a50 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceCachingFilter.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceCachingFilter.java @@ -26,14 +26,14 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -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.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +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.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.causeway.commons.internal.exceptions._Exceptions.FluentException; @@ -124,7 +124,7 @@ public class TemplateResourceCachingFilter implements Filter { * @param pConfig * the config * - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) + * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig) */ @Override public void init(final FilterConfig pConfig) { @@ -165,8 +165,8 @@ public class TemplateResourceCachingFilter implements Filter { * @throws ServletException * the servlet exception * - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ @Override public void doFilter(final ServletRequest servletRequest, final ServletResponse servletResponse, final FilterChain chain) throws IOException, ServletException { diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java index 4be5d8908c..ed733485b5 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/TemplateResourceServlet.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/WebModuleTemplateResources.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/WebModuleTemplateResources.java index 844e3ab2d3..cc6cb83046 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/WebModuleTemplateResources.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/WebModuleTemplateResources.java @@ -18,11 +18,11 @@ */ package org.apache.causeway.core.webapp.modules.templresources; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -41,7 +41,7 @@ import lombok.Getter; */ @Service @Named("causeway.webapp.WebModuleTemplateResources") [email protected](PriorityPrecedence.MIDPOINT - 100) [email protected](PriorityPrecedence.MIDPOINT - 100) @Qualifier("TemplateResources") public final class WebModuleTemplateResources extends WebModuleAbstract { diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/_Util.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/_Util.java index f3db1ee76e..e77d725637 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/_Util.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/modules/templresources/_Util.java @@ -22,7 +22,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import lombok.experimental.UtilityClass; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/ForwardingServlet.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/ForwardingServlet.java index 219ea2f430..929f38a049 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/ForwardingServlet.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/ForwardingServlet.java @@ -20,11 +20,11 @@ package org.apache.causeway.core.webapp.routing; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.val; import lombok.extern.log4j.Log4j2; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectFilter.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectFilter.java index 3eab1bccac..eeed77c0d2 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectFilter.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectFilter.java @@ -20,14 +20,14 @@ package org.apache.causeway.core.webapp.routing; 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 javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +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.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.causeway.core.metamodel.commons.StringExtensions; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectServlet.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectServlet.java index 3d0d2d3483..52cc3891b8 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectServlet.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectServlet.java @@ -20,11 +20,11 @@ package org.apache.causeway.core.webapp.routing; import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.causeway.core.metamodel.commons.StringExtensions; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectToDocsFilter.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectToDocsFilter.java index 381a5f7f32..b4f525da6f 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectToDocsFilter.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/routing/RedirectToDocsFilter.java @@ -20,14 +20,14 @@ package org.apache.causeway.core.webapp.routing; 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 javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +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.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.extern.log4j.Log4j2; diff --git a/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/CausewayWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/CausewayWebAppContextInitializer.java index 538b69fd9f..e2d53caa5d 100644 --- a/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/CausewayWebAppContextInitializer.java +++ b/core/webapp/src/main/java/org/apache/causeway/core/webapp/webappctx/CausewayWebAppContextInitializer.java @@ -20,11 +20,11 @@ package org.apache.causeway.core.webapp.webappctx; import java.util.EventListener; -import javax.inject.Inject; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletException; +import jakarta.inject.Inject; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletException; import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.stereotype.Component;
