完善 solon-server-jetty-jakarta 适配

Author: noear

solon-jakarta-parent/pom.xml

@@ -22,13 +22,13 @@
 
         <jakarta.logback.version>1.5.18</jakarta.logback.version>
         <jakarta.servlet5.version>5.0.0</jakarta.servlet5.version>
-        <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
+        <jakarta.servlet6.version>6.1.0</jakarta.servlet6.version>
 
         <cxf.version>4.1.2</cxf.version>
 
-        <jetty.version>12.0.14</jetty.version>
-        <jetty-servlet.version>11.0.24</jetty-servlet.version>
-        <jetty-servlet-jstl.version>10.0.24</jetty-servlet-jstl.version>
+        <jetty.version>12.1.0</jetty.version>
+        <jetty-servlet.version>11.0.26</jetty-servlet.version>
+        <jetty-servlet-jstl.version>10.0.26</jetty-servlet-jstl.version>
     </properties>
 
     <dependencyManagement>

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

@@ -19,27 +19,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet6.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>${jetty-servlet.version}</version>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jsp</artifactId>
-            <version>${jetty-servlet.version}</version>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-apache-jsp</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jstl</artifactId>
             <version>${jetty-servlet-jstl.version}</version>
-            <type>pom</type>
         </dependency>
     </dependencies>
 

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

@@ -41,12 +41,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty-servlet.version}</version>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
 
-
         <!-- jetty web socket -->
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
@@ -56,27 +55,30 @@
 
         <!-- jetty jsp -->
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
-            <version>${jetty-servlet.version}</version>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
+            <version>${jetty.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jsp</artifactId>
-            <version>${jetty-servlet.version}</version>
-            <type>jar</type>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-apache-jsp</artifactId>
+            <version>${jetty.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jstl</artifactId>
             <version>${jetty-servlet-jstl.version}</version>
-            <type>pom</type>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-test</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -15,17 +15,19 @@
  */
 package org.noear.solon.boot.jetty;
 
-import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.session.DefaultSessionIdManager;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
 import org.noear.solon.boot.ServerLifecycle;
+import org.noear.solon.boot.jetty.websocket.WebSocketCreatorImpl;
 import org.noear.solon.core.event.EventBus;
 import org.noear.solon.core.util.ClassUtil;
 
 import java.io.IOException;
 
-class JettyServer extends JettyServerBase implements ServerLifecycle {
+public class JettyServer extends JettyServerBase implements ServerLifecycle {
     protected Server real = null;
 
     protected boolean enableWebSocket;
@@ -70,14 +72,17 @@ protected void setup(String host, int port) throws IOException {
 
         //session 支持
         if (enableSessionState) {
-            real.setSessionIdManager(new DefaultSessionIdManager(real));
+            real.addBean(new DefaultSessionIdManager(real));
         }
 
+        ServletContextHandler contextHandler = buildHandler();
+        real.setHandler(contextHandler);
+
         if (enableWebSocket && wsClz != null) {
-            real.setHandler(new HandlerHub(buildHandler()));
-        } else {
-            //没有ws包 或 没有开启
-            real.setHandler(buildHandler());
+            //real.setHandler(new HandlerHub(buildHandler()));
+            WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler);
+            wsHandler.getServerWebSocketContainer().addMapping("/*", new WebSocketCreatorImpl());
+            real.setHandler(wsHandler);
         }
 
         //1.1:分发事件（充许外部扩展）
@@ -87,7 +92,7 @@ protected void setup(String host, int port) throws IOException {
     /**
      * 获取Server Handler
      */
-    protected Handler buildHandler() throws IOException {
+    protected ServletContextHandler buildHandler() throws IOException {
         return getServletHandler();
     }
 }

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

@@ -15,10 +15,9 @@
  */
 package org.noear.solon.boot.jetty;
 
-import org.eclipse.jetty.jsp.JettyJspServlet;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.jsp.JettyJspServlet;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.noear.solon.boot.jetty.http.JtJspStarter;
 import org.noear.solon.boot.jetty.jsp.JspTldLocator;
 
@@ -29,13 +28,13 @@
 import java.net.URLClassLoader;
 import java.util.Map;
 
-class JettyServerAddJsp extends JettyServer {
+public class JettyServerAddJsp extends JettyServer {
 
     /**
      * 获取Server Handler
      */
     @Override
-    protected Handler buildHandler() throws IOException {
+    protected ServletContextHandler buildHandler() throws IOException {
         ServletContextHandler handler = getServletHandler();
 
         enableJspSupport(handler);
@@ -70,12 +69,12 @@ private void addTdlSupport(ServletContext servletContext) throws IOException {
             ServletContextHandler.JspConfig jspConfig = (ServletContextHandler.JspConfig) servletContext.getJspConfigDescriptor();
             if (jspConfig == null) {
                 jspConfig = new ServletContextHandler.JspConfig();
-                ((ServletContextHandler.Context) servletContext).setJspConfigDescriptor(jspConfig);
+                ((ServletContextHandler.ServletContextApi) servletContext).setJspConfigDescriptor(jspConfig);
             }
 
             for (TaglibDescriptor descriptor : tagLibInfos.values()) {
                 jspConfig.addTaglibDescriptor(descriptor);
             }
         }
     }
-}
+}

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

@@ -15,10 +15,12 @@
  */
 package org.noear.solon.boot.jetty;
 
+import jakarta.servlet.MultipartConfigElement;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.SessionHandler;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.server.*;
-import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerConstants;
@@ -40,14 +42,22 @@
 import java.util.Set;
 import java.util.concurrent.Executor;
 
-abstract class JettyServerBase implements ServerLifecycle , HttpServerConfigure {
+import static org.eclipse.jetty.ee10.servlet.ServletContextHandler.getServletContext;
+
+public abstract class JettyServerBase implements ServerLifecycle , HttpServerConfigure {
     protected Executor executor;
     protected HttpServerProps props = HttpServerProps.getInstance();
     protected SslConfig sslConfig = new SslConfig(ServerConstants.SIGNAL_HTTP);
     protected boolean enableSessionState;
-
     private boolean isSecure;
 
+    private String _tempdir;
+
+    private int _fileOutputBuffer = 0;
+
+    private long _maxBodySize;
+    private long _maxFileSize;
+
     public boolean isSecure() {
         return isSecure;
     }
@@ -60,6 +70,7 @@ public void enableSessionState(boolean enableSessionState) {
     protected Set<Integer> addHttpPorts = new LinkedHashSet<>();
 
 
+
     /**
      * 是否允许Ssl
      */
@@ -146,9 +157,24 @@ protected ServerConnector getConnector(Server server, String host, int port, boo
     }
 
     protected ServletContextHandler getServletHandler() throws IOException {
+        _tempdir = System.getenv("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);
+
+        MultipartConfigElement multipartConfig = new MultipartConfigElement(
+                _tempdir,
+                _maxFileSize,
+                _maxBodySize,
+                _fileOutputBuffer);
+
+        ServletHolder servletHolder = new ServletHolder(new JtHttpContextServletHandler());
+        servletHolder.setAsyncSupported(true);
+        servletHolder.getRegistration().setMultipartConfig(multipartConfig);
+
         ServletContextHandler handler = new ServletContextHandler();
         handler.setContextPath("/");
-        handler.addServlet(JtHttpContextServletHandler.class, "/").setAsyncSupported(true);
+        handler.addServlet(servletHolder, "/");
 
 
         //添加session state 支持
@@ -161,7 +187,7 @@ protected ServletContextHandler getServletHandler() throws IOException {
         }
 
         //添加容器初始器
-        handler.addLifeCycleListener(new JtContainerInitializer(handler.getServletContext()));
+        handler.addBean(new JtContainerInitializer(handler.getServletContext()));
 
 
         //添加临时文件（用于jsp编译，或文件上传）

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

@@ -15,20 +15,18 @@
  */
 package org.noear.solon.boot.jetty.http;
 
-import org.eclipse.jetty.http.MultiPartFormInputStream;
 import org.noear.solon.boot.ServerProps;
-import org.noear.solon.boot.jetty.XPluginImp;
+import org.noear.solon.boot.jetty.integration.JettyPlugin;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.web.servlet.SolonServletHandler;
 
 import jakarta.servlet.MultipartConfigElement;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
+
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 
 public class JtHttpContextServletHandler extends SolonServletHandler {
     private File _tempdir;
@@ -54,9 +52,9 @@ public void init() throws ServletException {
     }
 
     @Override
-    protected void preHandle(Context ctx) throws IOException {
+    protected void preHandle(Context ctx) {
         if (ServerProps.output_meta) {
-            ctx.headerSet("Solon-Boot", XPluginImp.solon_boot_ver());
+            ctx.headerSet("Solon-Boot", JettyPlugin.solon_boot_ver());
         }
     }
 
@@ -76,14 +74,14 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
             if (ServerProps.request_useTempfile) {
                 //如果使用临时文件
                 //
-                InputStream in = new BufferedInputStream(request.getInputStream());
-                String ct = request.getContentType();
+                // InputStream in = new BufferedInputStream(request.getInputStream());
+                //String ct = request.getContentType();
 
 
-                MultiPartFormInputStream multiPartParser = new MultiPartFormInputStream(in, ct, config, _tempdir);
-                multiPartParser.setWriteFilesWithFilenames(true);
+//                MultiPartFormInputStream multiPartParser = new MultiPartFormInputStream(in, ct, config, _tempdir);
+//                multiPartParser.setWriteFilesWithFilenames(true);
 
-                request = new JtHttpRequestWrapper(request, multiPartParser);
+                //request = new JtHttpRequestWrapper(request, multiPartParser);
             }
         }