转移 solon-web-servlet-jakarta，solon.web.servlet.jakarta 到 solon-jakarta 仓库

noear · noear · commit af8c0b6ec467 · 2025-08-12T20:31:29.000+08:00
diff --git a/__release/solon-jakarta-bundle1/pom.xml b/__release/solon-jakarta-bundle1/pom.xml
@@ -26,6 +26,12 @@
 
         <module>../../solon-jakarta-projects/solon-logging/solon-logging-logback-jakarta</module>
 
+        <module>../../solon-jakarta-projects/solon-render/solon-view-jsp-jakarta</module>
+
+        <module>../../solon-jakarta-projects/solon-web/solon-web-servlet-jakarta</module>
+
         <module>../../solon-jakarta-projects/solon-web/solon-web-webservices-jakarta</module>
+
+        <module>../../solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta</module>
     </modules>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -26,9 +26,5 @@
         <module>solon-jakarta-projects/solon-boot/solon-boot-undertow-add-jsp-jakarta</module>
         <module>solon-jakarta-projects/solon-boot/solon-boot-undertow-jakarta</module>
 
-        <module>solon-jakarta-projects/solon-render/solon-view-jsp-jakarta</module>
-
-        <module>solon-jakarta-projects/solon-web/solon-web-servlet-jakarta</module>
-
     </modules>
 </project>
diff --git a/solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/pom.xml b/solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/pom.xml
@@ -27,12 +27,12 @@
     <dependencies>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.boot</artifactId>
+            <artifactId>solon-boot</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.net</artifactId>
+            <artifactId>solon-net</artifactId>
         </dependency>
 
         <dependency>
diff --git a/solon-jakarta-projects/solon-render/solon-view-jsp-jakarta/pom.xml b/solon-jakarta-projects/solon-render/solon-view-jsp-jakarta/pom.xml
@@ -23,12 +23,12 @@
     <dependencies>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.view</artifactId>
+            <artifactId>solon-view</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.auth</artifactId>
+            <artifactId>solon-security-auth</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/pom.xml b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/pom.xml
@@ -22,12 +22,12 @@
     <dependencies>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.boot</artifactId>
+            <artifactId>solon-boot</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>solon.net</artifactId>
+            <artifactId>solon-net</artifactId>
         </dependency>
 
         <dependency>
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/AsyncListenerWrap.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/AsyncListenerWrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/MultipartUtil.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/MultipartUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContext.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
@@ -19,6 +19,7 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.boot.web.*;
@@ -86,7 +87,7 @@ public Object pull(Class<?> clz) {
         Object tmp = super.pull(clz);
 
         if (tmp == null) {
-            if (clz.isInstance(_request.getSession())) {
+            if (HttpSession.class.isAssignableFrom(clz)) {
                 return _request.getSession();
             }
         }
@@ -228,7 +229,7 @@ public MultiMap<UploadedFile> fileMap() {
     @Override
     public MultiMap<String> cookieMap() {
         if (_cookieMap == null) {
-            _cookieMap = new MultiMap<String>();
+            _cookieMap = new MultiMap<>(false);
 
             //_request.cookies() 可能不支持多个同名 cookie
             DecodeUtils.decodeCookies(this, header(Constants.HEADER_COOKIE));
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContextListener.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContextListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
@@ -17,7 +17,6 @@
 
 import jakarta.servlet.*;
 import org.noear.solon.Solon;
-import org.noear.solon.SolonApp;
 import org.noear.solon.Utils;
 import org.noear.solon.boot.ServerProps;
 import org.noear.solon.core.Constants;
@@ -130,12 +129,8 @@ private void invokeMain(ServletContext sc, String[] strArgs) throws RuntimeExcep
      */
     @Override
     public void contextDestroyed(ServletContextEvent sce) {
-        // 1.获取SolonApp
-        SolonApp app = Solon.app();
-
-        // 2.阻塞关闭Solon
-        if (app.cfg().stopSafe()) {
-            Solon.stopBlock(false, app.cfg().stopDelay());
+        if (Solon.cfg().stopSafe()) {
+            Solon.stopBlock(false, Solon.cfg().stopDelay());
         } else {
             Solon.stopBlock(false, 0);
         }
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletFilter.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
@@ -65,7 +65,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 //重新设置当前上下文（上面会清掉）
                 ContextHolder.currentSet(ctx);
 
-                if (ctx.getHandled() == false) {
+                if (ctx.getHandled() == false && ctx.status() == 200) { //说明未处理，且状态未变
                     //如果未处理，则传递过滤链
                     filterChain.doFilter(request, response);
                 }
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletHandler.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
@@ -21,6 +21,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import org.noear.solon.Solon;
 import org.noear.solon.core.handle.Context;
+import org.noear.solon.core.util.MimeType;
 
 import java.io.IOException;
 
@@ -39,7 +40,7 @@ protected void preHandle(Context ctx) {
     @Override
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         SolonServletContext ctx = new SolonServletContext(request, response);
-        ctx.contentType("text/plain;charset=UTF-8");
+        ctx.contentType(MimeType.TEXT_PLAIN_UTF8_VALUE);
 
         preHandle(ctx);
 
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletInstaller.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletInstaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletSessionState.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletSessionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonWebSocketEndpoint.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonWebSocketEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterHodler.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterHodler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletHolder.java b/solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * 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.
diff --git a/solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta/NOTICE b/solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta/NOTICE
@@ -0,0 +1,24 @@
+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.
+
+This project includes:
+  Jakarta Servlet under EPL 2.0 or GPL2 w/ CPE
+  SLF4J API Module under MIT License
+  solon under The Apache Software License, Version 2.0
+  solon-boot under The Apache Software License, Version 2.0
+  solon-mvc under The Apache Software License, Version 2.0
+  solon-net under The Apache Software License, Version 2.0
+  solon-web-servlet-jakarta under The Apache Software License, Version 2.0
+  solon.web.servlet.jakarta under The Apache Software License, Version 2.0
+
diff --git a/solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml b/solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.noear</groupId>
+        <artifactId>solon-parent</artifactId>
+        <version>3.4.3</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>solon.web.servlet.jakarta</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>jar</packaging>
+
+    <properties>
+        <java.version>17</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon-web-servlet-jakarta</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2017-2024 noear.org and authors`
	`2`	`+ * Copyright 2017-2025 noear.org and authors`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`