Migrate to Jakarta EE Servlet 6.0
- Update build.gradle: jakarta.servlet-api:6.1.0 - Update EnhancedMcpServlet.groovy: Jakarta imports and servlet attributes - Update WebFacadeStub.groovy: Complete Jakarta migration - New Servlet 6.0 methods (getRequestId, getProtocolRequestId, getServletConnection) - Removed deprecated methods (getSessionContext, getRealPath, etc.) - New sendRedirect(String, int, boolean) overload - Update TestHealthServlet.java: Jakarta servlet imports Aligns with upstream framework migration to Jakarta EE.
Showing
4 changed files
with
12 additions
and
12 deletions
| ... | @@ -34,7 +34,7 @@ dependencies { | ... | @@ -34,7 +34,7 @@ dependencies { |
| 34 | compileOnly project(':framework') | 34 | compileOnly project(':framework') |
| 35 | 35 | ||
| 36 | // Servlet API (provided by framework, but needed for compilation) | 36 | // Servlet API (provided by framework, but needed for compilation) |
| 37 | compileOnly 'javax.servlet:javax.servlet-api:4.0.1' | 37 | compileOnly 'jakarta.servlet:jakarta.servlet-api:6.1.0' |
| 38 | 38 | ||
| 39 | // Test dependencies | 39 | // Test dependencies |
| 40 | testImplementation project(':framework') | 40 | testImplementation project(':framework') | ... | ... |
| ... | @@ -25,11 +25,11 @@ import org.moqui.context.ExecutionContext | ... | @@ -25,11 +25,11 @@ import org.moqui.context.ExecutionContext |
| 25 | import org.slf4j.Logger | 25 | import org.slf4j.Logger |
| 26 | import org.slf4j.LoggerFactory | 26 | import org.slf4j.LoggerFactory |
| 27 | 27 | ||
| 28 | import javax.servlet.ServletConfig | 28 | import jakarta.servlet.ServletConfig |
| 29 | import javax.servlet.ServletException | 29 | import jakarta.servlet.ServletException |
| 30 | import javax.servlet.http.HttpServlet | 30 | import jakarta.servlet.http.HttpServlet |
| 31 | import javax.servlet.http.HttpServletRequest | 31 | import jakarta.servlet.http.HttpServletRequest |
| 32 | import javax.servlet.http.HttpServletResponse | 32 | import jakarta.servlet.http.HttpServletResponse |
| 33 | import java.sql.Timestamp | 33 | import java.sql.Timestamp |
| 34 | import java.util.concurrent.ConcurrentHashMap | 34 | import java.util.concurrent.ConcurrentHashMap |
| 35 | import java.util.concurrent.atomic.AtomicBoolean | 35 | import java.util.concurrent.atomic.AtomicBoolean |
| ... | @@ -281,8 +281,8 @@ class EnhancedMcpServlet extends HttpServlet { | ... | @@ -281,8 +281,8 @@ class EnhancedMcpServlet extends HttpServlet { |
| 281 | // Modify request path to avoid ScreenResourceNotFoundException | 281 | // Modify request path to avoid ScreenResourceNotFoundException |
| 282 | String originalRequestURI = request.getRequestURI() | 282 | String originalRequestURI = request.getRequestURI() |
| 283 | String originalPathInfo = request.getPathInfo() | 283 | String originalPathInfo = request.getPathInfo() |
| 284 | request.setAttribute("javax.servlet.include.request_uri", "/mcp") | 284 | request.setAttribute("jakarta.servlet.include.request_uri", "/mcp") |
| 285 | request.setAttribute("javax.servlet.include.path_info", "") | 285 | request.setAttribute("jakarta.servlet.include.path_info", "") |
| 286 | 286 | ||
| 287 | try { | 287 | try { |
| 288 | ec.initWebFacade(webappName, request, response) | 288 | ec.initWebFacade(webappName, request, response) | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -13,10 +13,10 @@ | ... | @@ -13,10 +13,10 @@ |
| 13 | */ | 13 | */ |
| 14 | package org.moqui.mcp.test; | 14 | package org.moqui.mcp.test; |
| 15 | 15 | ||
| 16 | import javax.servlet.ServletException; | 16 | import jakarta.servlet.ServletException; |
| 17 | import javax.servlet.http.HttpServlet; | 17 | import jakarta.servlet.http.HttpServlet; |
| 18 | import javax.servlet.http.HttpServletRequest; | 18 | import jakarta.servlet.http.HttpServletRequest; |
| 19 | import javax.servlet.http.HttpServletResponse; | 19 | import jakarta.servlet.http.HttpServletResponse; |
| 20 | import java.io.IOException; | 20 | import java.io.IOException; |
| 21 | import java.io.PrintWriter; | 21 | import java.io.PrintWriter; |
| 22 | 22 | ... | ... |
-
Please register or sign in to post a comment