From 87333ef60b2ec6fbafe592253756cc08990117b2 Mon Sep 17 00:00:00 2001 From: Rick Grashel Date: Thu, 25 Sep 2025 14:20:40 -0500 Subject: [PATCH] * Fix #115 - Leftover javax dependencies --- .../net/sourceforge/stripes/controller/StripesConstants.java | 4 ++-- .../controller/multipart/DefaultMultipartWrapperFactory.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stripes/src/main/java/net/sourceforge/stripes/controller/StripesConstants.java b/stripes/src/main/java/net/sourceforge/stripes/controller/StripesConstants.java index c8988558..cbd47c07 100644 --- a/stripes/src/main/java/net/sourceforge/stripes/controller/StripesConstants.java +++ b/stripes/src/main/java/net/sourceforge/stripes/controller/StripesConstants.java @@ -103,11 +103,11 @@ public interface StripesConstants { * Request attribute key defined by the servlet spec for storing the included servlet path when * processing a server side include. */ - String REQ_ATTR_INCLUDE_PATH = "javax.servlet.include.servlet_path"; + String REQ_ATTR_INCLUDE_PATH = "jakarta.servlet.include.servlet_path"; /** * Request attribute key defined by the servlet spec for storing the included path info when * processing a server side include. */ - String REQ_ATTR_INCLUDE_PATH_INFO = "javax.servlet.include.path_info"; + String REQ_ATTR_INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info"; } diff --git a/stripes/src/main/java/net/sourceforge/stripes/controller/multipart/DefaultMultipartWrapperFactory.java b/stripes/src/main/java/net/sourceforge/stripes/controller/multipart/DefaultMultipartWrapperFactory.java index 4b929349..7c3e0757 100644 --- a/stripes/src/main/java/net/sourceforge/stripes/controller/multipart/DefaultMultipartWrapperFactory.java +++ b/stripes/src/main/java/net/sourceforge/stripes/controller/multipart/DefaultMultipartWrapperFactory.java @@ -27,7 +27,7 @@ /** * Default implementation of a factory for MultipartWrappers. Looks up a class name in Configuration * under the key specified by {@link #WRAPPER_CLASS_NAME}. If no class name is configured, defaults - * to the {@link CosMultipartWrapper}. An additional configuration parameter is supported to specify + * to the {@link CommonsMultipartWrapper}. An additional configuration parameter is supported to specify * the maximum post size allowable. * * @author Tim Fennell @@ -106,7 +106,8 @@ public void init(Configuration config) throws Exception { } // Figure out where the temp directory is, and store that info - File tempDir = (File) config.getServletContext().getAttribute("javax.servlet.context.tempdir"); + File tempDir = + (File) config.getServletContext().getAttribute("jakarta.servlet.context.tempdir"); if (tempDir != null) { this.temporaryDirectory = tempDir; } else {