调整包结构 (solon-server)solon.server 部分替代 solon.boot

Author: noear

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/MultipartUtil.java

@@ -17,7 +17,7 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.Part;
-import org.noear.solon.boot.ServerProps;
+import org.noear.solon.server.ServerProps;
 import org.noear.solon.core.exception.StatusException;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.UploadedFile;

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContext.java

@@ -21,12 +21,17 @@
 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.*;
+import org.noear.solon.server.ServerProps;
+import org.noear.solon.server.handle.AsyncContextState;
+import org.noear.solon.server.handle.ContextBase;
+import org.noear.solon.server.handle.HeaderNames;
+import org.noear.solon.server.http.*;
 import org.noear.solon.core.handle.ContextAsyncListener;
 import org.noear.solon.core.handle.UploadedFile;
 import org.noear.solon.core.util.IoUtil;
 import org.noear.solon.core.util.MultiMap;
+import org.noear.solon.server.util.DecodeUtils;
+import org.noear.solon.server.util.RedirectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +52,7 @@
  * @since 1.2
  * @since 2.9
  * */
-public class SolonServletContext extends WebContextBase {
+public class SolonServletContext extends ContextBase {
     static final Logger log = LoggerFactory.getLogger(SolonServletContext.class);
 
     private HttpServletRequest _request;
@@ -232,7 +237,7 @@ public MultiMap<String> cookieMap() {
             _cookieMap = new MultiMap<>(false);
 
             //_request.cookies() 可能不支持多个同名 cookie
-            DecodeUtils.decodeCookies(this, header(Constants.HEADER_COOKIE));
+            DecodeUtils.decodeCookies(this, header(HeaderNames.HEADER_COOKIE));
         }
 
         return _cookieMap;
@@ -355,7 +360,7 @@ public void cookieSet(org.noear.solon.core.handle.Cookie cookie) {
     public void redirect(String url, int code) {
         url = RedirectUtils.getRedirectPath(url);
 
-        headerSet(Constants.HEADER_LOCATION, url);
+        headerSet(HeaderNames.HEADER_LOCATION, url);
         statusDoSet(code);
     }
 

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletContextListener.java

@@ -18,7 +18,7 @@
 import jakarta.servlet.*;
 import org.noear.solon.Solon;
 import org.noear.solon.Utils;
-import org.noear.solon.boot.ServerProps;
+import org.noear.solon.server.ServerProps;
 import org.noear.solon.core.Constants;
 import org.noear.solon.core.event.AppInitEndEvent;
 import org.noear.solon.core.event.AppLoadEndEvent;