完善 solon-server-jetty-jakarta jsp 适配

Author: noear

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServerAddJsp.java

@@ -18,7 +18,7 @@
 import org.eclipse.jetty.ee11.jsp.JettyJspServlet;
 import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee11.servlet.ServletHolder;
-import org.noear.solon.boot.jetty.http.JtJspStarter;
+import org.noear.solon.boot.jetty.jsp.JspLifeCycle;
 import org.noear.solon.boot.jetty.jsp.JspTldLocator;
 
 import jakarta.servlet.ServletContext;
@@ -37,13 +37,13 @@ public class JettyServerAddJsp extends JettyServer {
     protected ServletContextHandler buildHandler() throws IOException {
         ServletContextHandler handler = getServletHandler();
 
-        enableJspSupport(handler);
+        addJspSupport(handler);
         addTdlSupport(handler.getServletContext());
 
         return handler;
     }
 
-    private void enableJspSupport(ServletContextHandler handler) throws IOException {
+    private void addJspSupport(ServletContextHandler handler) throws IOException {
 
         // Set Classloader of Context to be sane (needed for JSTL)
         // JSP requires a non-System classloader, this simply wraps the
@@ -53,7 +53,7 @@ private void enableJspSupport(ServletContextHandler handler) throws IOException
         handler.setClassLoader(jspClassLoader);
 
         // Manually call JettyJasperInitializer on context startup
-        handler.addBean(new JtJspStarter(handler));
+        handler.addBean(new JspLifeCycle(handler));
 
         // Create / Register JSP Servlet (must be named "jsp" per spec)
         ServletHolder holderJsp = new ServletHolder("jsp", JettyJspServlet.class);
@@ -63,7 +63,7 @@ private void enableJspSupport(ServletContextHandler handler) throws IOException
     }
 
     private void addTdlSupport(ServletContext servletContext) throws IOException {
-        Map<String, TaglibDescriptor> tagLibInfos = JspTldLocator.createTldInfos("templates");
+        Map<String, TaglibDescriptor> tagLibInfos = JspTldLocator.createTldInfos("WEB-INF", "templates");
 
         if (tagLibInfos.size() > 0) {
             ServletContextHandler.JspConfig jspConfig = (ServletContextHandler.JspConfig) servletContext.getJspConfigDescriptor();

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServerBase.java

@@ -157,7 +157,7 @@ protected ServerConnector getConnector(Server server, String host, int port, boo
     }
 
     protected ServletContextHandler getServletHandler() throws IOException {
-        _tempdir = System.getenv("java.io.tmpdir");
+        _tempdir = System.getProperty("java.io.tmpdir");
         _fileOutputBuffer = 1 * 1024 * 1024;
         _maxBodySize = (ServerProps.request_maxBodySize > 0 ? ServerProps.request_maxBodySize : -1L);
         _maxFileSize = (ServerProps.request_maxFileSize > 0 ? ServerProps.request_maxFileSize : -1L);
@@ -192,14 +192,14 @@ protected ServletContextHandler getServletHandler() throws IOException {
 
         //添加临时文件（用于jsp编译，或文件上传）
         File tempDir = new File(System.getProperty("java.io.tmpdir"));
-        File scratchDir = new File(tempDir.toString(), "solon.boot.jetty");
+        File scratchDir = new File(tempDir.toString(), "solon.server.jetty");
 
         if (!scratchDir.exists()) {
             if (!scratchDir.mkdirs()) {
                 throw new IOException("Unable to create scratch directory: " + scratchDir);
             }
         }
-        handler.setAttribute("javax.servlet.context.tempdir", scratchDir);
+        handler.setAttribute("jakarta.servlet.context.tempdir", scratchDir);
 
         return handler;
     }

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/http/JtHttpContextServletHandler.java

@@ -40,7 +40,7 @@ public class JtHttpContextServletHandler extends SolonServletHandler {
     public void init() throws ServletException {
         super.init();
 
-        _tempdir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir");
+        _tempdir = (File) getServletContext().getAttribute("jakarta.servlet.context.tempdir");
 
         String fileOutputBuffer = getServletConfig().getInitParameter("fileOutputBuffer");
         if (fileOutputBuffer != null) {

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/integration/JettyPlugin.java

@@ -15,6 +15,7 @@
  */
 package org.noear.solon.boot.jetty.integration;
 
+import org.eclipse.jetty.ee11.jsp.JettyJspServlet;
 import org.noear.solon.Solon;
 import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
@@ -69,17 +70,10 @@ private void start0(AppContext context) throws Throwable {
         //初始化属性
         ServerProps.init();
 
-        Class<?> jspClz = ClassUtil.loadClass("org.eclipse.jetty.jsp.JettyJspServlet");
-
-//        if (ServerProps.request_maxBodySize > 0) {
-//            System.setProperty(ContextHandler.MAX_FORM_CONTENT_SIZE_KEY,
-//                    String.valueOf(ServerProps.request_maxBodySize));
-//        }
-
-        if (jspClz == null) {
-            _server = new JettyServer();
-        } else {
+        if (ClassUtil.hasClass(() -> JettyJspServlet.class)) {
             _server = new JettyServerAddJsp();
+        } else {
+            _server = new JettyServer();
         }
 
         _server.enableWebSocket(context.app().enableWebSocket());

…/solon/boot/jetty/http/JtJspStarter.java …r/solon/boot/jetty/jsp/JspLifeCycle.javasolon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/http/JtJspStarter.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/jsp/JspLifeCycle.java solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/http/JtJspStarter.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/jsp/JspLifeCycle.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.boot.jetty.http;
+package org.noear.solon.boot.jetty.jsp;
 
 import org.apache.tomcat.util.scan.StandardJarScanner;
 import org.eclipse.jetty.ee11.apache.jsp.JettyJasperInitializer;
 import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
 
-public class JtJspStarter extends AbstractLifeCycle
+public class JspLifeCycle extends AbstractLifeCycle
         implements ServletContextHandler.ServletContainerInitializerCaller {
     JettyJasperInitializer sci;
     ServletContextHandler context;
 
-    public JtJspStarter(ServletContextHandler context) {
+    public JspLifeCycle(ServletContextHandler context) {
 
         this.sci = new JettyJasperInitializer();
         this.context = context;
@@ -34,7 +34,6 @@ public JtJspStarter(ServletContextHandler context) {
 
     @Override
     protected void doStart() throws Exception {
-
         ClassLoader old = Thread.currentThread().getContextClassLoader();
         Thread.currentThread().setContextClassLoader(context.getClassLoader());
         try {

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/resources/META-INF/native-image/org.noear/solon.boot.jetty/resource-config.json

@@ -2,10 +2,10 @@
   "resources": {
     "includes": [
       {
-        "pattern": "javax/servlet/LocalStrings.*\\.properties"
+        "pattern": "jakarta/servlet/LocalStrings.*\\.properties"
       },
       {
-        "pattern": "javax/servlet/http/LocalStrings.*\\.properties"
+        "pattern": "jakarta/servlet/http/LocalStrings.*\\.properties"
       }
     ]
   }

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/integration/ViewJspPlugin.java

@@ -15,6 +15,8 @@
  */
 package org.noear.solon.view.jsp.integration;
 
+import jakarta.servlet.ServletResponse; //用于检测
+
 import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 import org.noear.solon.core.util.ClassUtil;
@@ -25,7 +27,7 @@ public class ViewJspPlugin implements Plugin {
 
     @Override
     public void start(AppContext context) {
-        if (ClassUtil.loadClass("jakarta.servlet.ServletResponse") == null) {
+        if (ClassUtil.hasClass(() -> ServletResponse.class) == false) {
             LogUtil.global().warn("View: jakarta.servlet.ServletResponse not exists! JspRender failed to load.");
             return;
         }