添加 jsp 单元测试

Author: noear

__release/solon-jakarta-bundle1/pom.xml

@@ -31,6 +31,7 @@
         <module>../../solon-jakarta-projects/solon-server/solon-server-jetty-add-websocket-jakarta</module>
 
         <module>../../solon-jakarta-projects/solon-server/solon-server-undertow-jakarta</module>
+        <module>../../solon-jakarta-projects/solon-server/solon-server-undertow-add-jsp-jakarta</module>
 
         <module>../../solon-jakarta-projects/solon-server/solon-server-tomcat-jakarta</module>
         <module>../../solon-jakarta-projects/solon-server/solon-server-tomcat-add-jsp-jakarta</module>

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/pom.xml

@@ -18,6 +18,16 @@
     <description>Java project for solon</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-server-jetty-jakarta</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-view-jsp-jakarta</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
@@ -47,6 +57,18 @@
             <artifactId>jakarta.el-api</artifactId>
             <version>6.0.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-logging-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/src/test/java/features/jetty/jsp/App.java

@@ -0,0 +1,27 @@
+package features.jetty.jsp;
+
+import org.noear.solon.Solon;
+import org.noear.solon.annotation.Controller;
+import org.noear.solon.annotation.Mapping;
+import org.noear.solon.core.handle.ModelAndView;
+
+/**
+ *
+ * @author noear 2025/12/1 created
+ *
+ */
+@Controller
+public class App {
+    public static void main(String[] args) {
+        Solon.start(App.class, args);
+    }
+
+    @Mapping("/")
+    public ModelAndView home() {
+        ModelAndView model = new ModelAndView("jsp.jsp");
+        model.put("title","dock");
+        model.put("msg","你好 world! in XController");
+
+        return model;
+    }
+}

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/src/test/java/features/jetty/jsp/FooterTag.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017-2025 noear.org and authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package features.jetty.jsp;
+
+
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.TagSupport;
+
+import java.io.IOException;
+
+public class FooterTag extends TagSupport {
+    @Override
+    public int doStartTag() throws JspException {
+        try {
+            StringBuffer sb = new StringBuffer();
+            sb.append("<div>").append("你好 world!").append("</div>");
+            pageContext.getOut().write(sb.toString());
+        } catch (IOException e) {
+            throw new JspException(e);
+        }
+
+        return super.doStartTag();
+    }
+
+    @Override
+    public int doEndTag() throws JspException {
+        return super.doEndTag();
+    }
+}

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/src/test/java/features/jetty/jsp/JettyJspTest.java

@@ -0,0 +1,18 @@
+package features.jetty.jsp;
+
+import org.junit.jupiter.api.Test;
+import org.noear.solon.test.HttpTester;
+import org.noear.solon.test.SolonTest;
+
+/**
+ *
+ * @author noear 2025/12/1 created
+ *
+ */
+@SolonTest(App.class)
+public class JettyJspTest extends HttpTester {
+    @Test
+    public void case1() {
+        assert path("/").get().contains("你好");
+    }
+}

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/src/test/resources/templates/jsp.jsp

@@ -0,0 +1,15 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="ct" uri="/tags" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <title>${title}</title>
+</head>
+<body>
+jsp::${msg}；i18n::${i18n.get("login.title")}
+
+<ct:footer />
+</body>
+</html>

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/src/test/resources/templates/tags.tld

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" version="2.0">
+
+    <description>自定义标签库</description>
+    <tlib-version>1.1</tlib-version>
+    <short-name>ct</short-name>
+    <uri>/tags</uri>
+
+    <tag>
+        <name>footer</name>
+        <tag-class>features.jetty.jsp.FooterTag</tag-class>
+        <body-content>empty</body-content>
+    </tag>
+
+</taglib>

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

@@ -19,14 +19,21 @@
 import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee11.servlet.ServletHolder;
 import org.eclipse.jetty.util.resource.PathResourceFactory;
+import org.noear.solon.Solon;
+import org.noear.solon.core.AppClassLoader;
+import org.noear.solon.core.runtime.NativeDetector;
 import org.noear.solon.core.util.ResourceUtil;
 import org.noear.solon.server.jetty.jsp.JspLifeCycle;
 import org.noear.solon.server.jetty.jsp.JspTldLocator;
 
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.descriptor.TaglibDescriptor;
+import org.noear.solon.server.util.DebugUtils;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Map;
@@ -41,8 +48,8 @@ protected ServletContextHandler buildHandler() throws IOException {
         ServletContextHandler handler = getServletHandler();
 
         //jsp 资源的根目录
-        PathResourceFactory rf = new PathResourceFactory();
-        handler.setBaseResource(rf.newResource(ResourceUtil.getResource("/")));
+        String resRoot = getResourceRoot();
+        handler.setBaseResourceAsString(resRoot);
 
         addJspSupport(handler);
         addTdlSupport(handler.getServletContext());
@@ -84,4 +91,50 @@ private void addTdlSupport(ServletContext servletContext) throws IOException {
             }
         }
     }
+
+    private String getResourceRoot() throws FileNotFoundException {
+        URL rootURL = getRootPath();
+
+        if (rootURL == null) {
+            if (NativeDetector.inNativeImage()) {
+                return "";
+            }
+
+            throw new FileNotFoundException("Unable to find root");
+        }
+
+        if (Solon.cfg().isDebugMode() && Solon.cfg().isFilesMode()) {
+            File dir = DebugUtils.getDebugLocation(AppClassLoader.global(), "/");
+            if (dir != null) {
+                return dir.toURI().getPath();
+            }
+        }
+
+        return rootURL.getPath();
+    }
+
+    private URL getRootPath() {
+        URL root = ResourceUtil.getResource("/");
+        if (root != null) {
+            return root;
+        }
+
+        try {
+            URL temp = ResourceUtil.getResource(""); //有些环境，/ 取不到根
+            if (temp == null) {
+                return null;
+            }
+
+            String path = temp.toString();
+            if (path.startsWith("jar:")) {
+                int endIndex = path.indexOf("!");
+                path = path.substring(0, endIndex + 1) + "/";
+            } else {
+                return null;
+            }
+            return new URL(path);
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
 }

solon-jakarta-projects/solon-server/solon-server-tomcat-add-jsp-jakarta/pom.xml

@@ -20,6 +20,12 @@
             <groupId>org.noear</groupId>
             <artifactId>solon-server-tomcat-jakarta</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-view-jsp-jakarta</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
@@ -43,5 +49,17 @@
 		    	</exclusion>
 		    </exclusions>
 		</dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-logging-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

solon-jakarta-projects/solon-server/solon-server-tomcat-add-jsp-jakarta/src/test/java/features/tomcat/jsp/App.java

@@ -0,0 +1,27 @@
+package features.tomcat.jsp;
+
+import org.noear.solon.Solon;
+import org.noear.solon.annotation.Controller;
+import org.noear.solon.annotation.Mapping;
+import org.noear.solon.core.handle.ModelAndView;
+
+/**
+ *
+ * @author noear 2025/12/1 created
+ *
+ */
+@Controller
+public class App {
+    public static void main(String[] args) {
+        Solon.start(App.class, args);
+    }
+
+    @Mapping("/")
+    public ModelAndView home() {
+        ModelAndView model = new ModelAndView("jsp.jsp");
+        model.put("title","dock");
+        model.put("msg","你好 world! in XController");
+
+        return model;
+    }
+}