diff --git a/mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java b/mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java index 5ece858..b9870fe 100644 --- a/mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java +++ b/mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java @@ -11,7 +11,7 @@ import com.mars.common.constant.MarsSpace; import com.mars.core.model.MarsBeanModel; import com.mars.mvc.model.MarsMappingModel; import com.mars.mvc.util.ParamAndResult; -import com.mars.tomcat.par.factory.ParamAndResultFactory; +import com.mars.iserver.par.factory.ParamAndResultFactory; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java b/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java index 4ee8fdd..10e8543 100644 --- a/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java +++ b/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java @@ -5,7 +5,7 @@ import com.mars.common.constant.MarsConstant; import com.mars.mvc.base.BaseInterceptor; import com.mars.mvc.model.MarsInterModel; import com.mars.mvc.util.ParamsCheckUtil; -import com.mars.tomcat.par.factory.ParamAndResultFactory; +import com.mars.iserver.par.factory.ParamAndResultFactory; import com.mars.server.server.request.HttpMarsRequest; import com.mars.server.server.request.HttpMarsResponse; import com.mars.server.util.RequestUtil; diff --git a/mars-mvc/src/main/java/com/mars/mvc/util/ParamAndResult.java b/mars-mvc/src/main/java/com/mars/mvc/util/ParamAndResult.java index dfc777d..f6e3c04 100644 --- a/mars-mvc/src/main/java/com/mars/mvc/util/ParamAndResult.java +++ b/mars-mvc/src/main/java/com/mars/mvc/util/ParamAndResult.java @@ -5,7 +5,7 @@ import com.mars.common.constant.MarsConstant; import com.mars.core.enums.DataType; import com.mars.server.server.request.HttpMarsRequest; import com.mars.server.server.request.HttpMarsResponse; -import com.mars.tomcat.par.base.BaseParamAndResult; +import com.mars.iserver.par.base.BaseParamAndResult; import java.lang.reflect.Method; diff --git a/mars-server/src/main/java/com/mars/tomcat/execute/HttpMarsRequestFactory.java b/mars-server/src/main/java/com/mars/iserver/execute/HttpMarsRequestFactory.java similarity index 99% rename from mars-server/src/main/java/com/mars/tomcat/execute/HttpMarsRequestFactory.java rename to mars-server/src/main/java/com/mars/iserver/execute/HttpMarsRequestFactory.java index bedb839..7cb99fb 100644 --- a/mars-server/src/main/java/com/mars/tomcat/execute/HttpMarsRequestFactory.java +++ b/mars-server/src/main/java/com/mars/iserver/execute/HttpMarsRequestFactory.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.execute; +package com.mars.iserver.execute; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/mars-server/src/main/java/com/mars/tomcat/execute/RequestExecute.java b/mars-server/src/main/java/com/mars/iserver/execute/RequestExecute.java similarity index 91% rename from mars-server/src/main/java/com/mars/tomcat/execute/RequestExecute.java rename to mars-server/src/main/java/com/mars/iserver/execute/RequestExecute.java index 365e50c..30c58ca 100644 --- a/mars-server/src/main/java/com/mars/tomcat/execute/RequestExecute.java +++ b/mars-server/src/main/java/com/mars/iserver/execute/RequestExecute.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.execute; +package com.mars.iserver.execute; import com.mars.common.ncfg.mvc.CoreServletClass; import com.mars.common.util.MesUtil; @@ -6,8 +6,8 @@ import com.mars.common.util.StringUtil; import com.mars.server.server.request.HttpMarsRequest; import com.mars.server.server.request.HttpMarsResponse; import com.mars.server.util.RequestUtil; -import com.mars.tomcat.execute.access.PathAccess; -import com.mars.tomcat.par.factory.ParamAndResultFactory; +import com.mars.iserver.execute.access.PathAccess; +import com.mars.iserver.par.factory.ParamAndResultFactory; import com.sun.net.httpserver.HttpExchange; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mars-server/src/main/java/com/mars/tomcat/execute/access/PathAccess.java b/mars-server/src/main/java/com/mars/iserver/execute/access/PathAccess.java similarity index 93% rename from mars-server/src/main/java/com/mars/tomcat/execute/access/PathAccess.java rename to mars-server/src/main/java/com/mars/iserver/execute/access/PathAccess.java index 688e9f9..89f9ba5 100644 --- a/mars-server/src/main/java/com/mars/tomcat/execute/access/PathAccess.java +++ b/mars-server/src/main/java/com/mars/iserver/execute/access/PathAccess.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.execute.access; +package com.mars.iserver.execute.access; import java.util.HashMap; import java.util.Map; diff --git a/mars-server/src/main/java/com/mars/tomcat/par/base/BaseParamAndResult.java b/mars-server/src/main/java/com/mars/iserver/par/base/BaseParamAndResult.java similarity index 95% rename from mars-server/src/main/java/com/mars/tomcat/par/base/BaseParamAndResult.java rename to mars-server/src/main/java/com/mars/iserver/par/base/BaseParamAndResult.java index 0c2c38a..5d3adbb 100644 --- a/mars-server/src/main/java/com/mars/tomcat/par/base/BaseParamAndResult.java +++ b/mars-server/src/main/java/com/mars/iserver/par/base/BaseParamAndResult.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.par.base; +package com.mars.iserver.par.base; import com.mars.server.server.request.HttpMarsRequest; import com.mars.server.server.request.HttpMarsResponse; diff --git a/mars-server/src/main/java/com/mars/tomcat/par/factory/ParamAndResultFactory.java b/mars-server/src/main/java/com/mars/iserver/par/factory/ParamAndResultFactory.java similarity index 81% rename from mars-server/src/main/java/com/mars/tomcat/par/factory/ParamAndResultFactory.java rename to mars-server/src/main/java/com/mars/iserver/par/factory/ParamAndResultFactory.java index 7e38ea1..ee94b0a 100644 --- a/mars-server/src/main/java/com/mars/tomcat/par/factory/ParamAndResultFactory.java +++ b/mars-server/src/main/java/com/mars/iserver/par/factory/ParamAndResultFactory.java @@ -1,6 +1,6 @@ -package com.mars.tomcat.par.factory; +package com.mars.iserver.par.factory; -import com.mars.tomcat.par.base.BaseParamAndResult; +import com.mars.iserver.par.base.BaseParamAndResult; public class ParamAndResultFactory { diff --git a/mars-server/src/main/java/com/mars/tomcat/server/MarsServer.java b/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java similarity index 87% rename from mars-server/src/main/java/com/mars/tomcat/server/MarsServer.java rename to mars-server/src/main/java/com/mars/iserver/server/MarsServer.java index bae8a15..53136b0 100644 --- a/mars-server/src/main/java/com/mars/tomcat/server/MarsServer.java +++ b/mars-server/src/main/java/com/mars/iserver/server/MarsServer.java @@ -1,16 +1,15 @@ -package com.mars.tomcat.server; +package com.mars.iserver.server; import com.mars.common.base.config.MarsConfig; import com.mars.common.constant.MarsConstant; import com.mars.common.constant.MarsSpace; import com.mars.common.util.MarsConfiguration; -import com.mars.tomcat.server.threadpool.ThreadPool; +import com.mars.iserver.server.threadpool.ThreadPool; import com.sun.net.httpserver.HttpServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.InetSocketAddress; -import java.util.concurrent.Executors; /** * tomcat服务 diff --git a/mars-server/src/main/java/com/mars/tomcat/server/MarsServerHandler.java b/mars-server/src/main/java/com/mars/iserver/server/MarsServerHandler.java similarity index 82% rename from mars-server/src/main/java/com/mars/tomcat/server/MarsServerHandler.java rename to mars-server/src/main/java/com/mars/iserver/server/MarsServerHandler.java index b4124c0..f45ec73 100644 --- a/mars-server/src/main/java/com/mars/tomcat/server/MarsServerHandler.java +++ b/mars-server/src/main/java/com/mars/iserver/server/MarsServerHandler.java @@ -1,7 +1,7 @@ -package com.mars.tomcat.server; +package com.mars.iserver.server; -import com.mars.tomcat.execute.RequestExecute; -import com.mars.tomcat.util.ResponseUtil; +import com.mars.iserver.execute.RequestExecute; +import com.mars.iserver.util.ResponseUtil; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import org.slf4j.Logger; diff --git a/mars-server/src/main/java/com/mars/tomcat/server/threadpool/ThreadPool.java b/mars-server/src/main/java/com/mars/iserver/server/threadpool/ThreadPool.java similarity index 96% rename from mars-server/src/main/java/com/mars/tomcat/server/threadpool/ThreadPool.java rename to mars-server/src/main/java/com/mars/iserver/server/threadpool/ThreadPool.java index ee81acb..bfd8439 100644 --- a/mars-server/src/main/java/com/mars/tomcat/server/threadpool/ThreadPool.java +++ b/mars-server/src/main/java/com/mars/iserver/server/threadpool/ThreadPool.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.server.threadpool; +package com.mars.iserver.server.threadpool; import com.mars.common.base.config.MarsConfig; import com.mars.common.base.config.model.ThreadPoolConfig; diff --git a/mars-server/src/main/java/com/mars/tomcat/util/FileUpLoad.java b/mars-server/src/main/java/com/mars/iserver/util/FileUpLoad.java similarity index 81% rename from mars-server/src/main/java/com/mars/tomcat/util/FileUpLoad.java rename to mars-server/src/main/java/com/mars/iserver/util/FileUpLoad.java index d0f7f96..2ec8abb 100644 --- a/mars-server/src/main/java/com/mars/tomcat/util/FileUpLoad.java +++ b/mars-server/src/main/java/com/mars/iserver/util/FileUpLoad.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.util; +package com.mars.iserver.util; import com.mars.common.base.config.model.FileUploadConfig; import com.mars.common.util.MarsConfiguration; diff --git a/mars-server/src/main/java/com/mars/tomcat/util/ResponseUtil.java b/mars-server/src/main/java/com/mars/iserver/util/ResponseUtil.java similarity index 94% rename from mars-server/src/main/java/com/mars/tomcat/util/ResponseUtil.java rename to mars-server/src/main/java/com/mars/iserver/util/ResponseUtil.java index 0aa489c..ce6fb52 100644 --- a/mars-server/src/main/java/com/mars/tomcat/util/ResponseUtil.java +++ b/mars-server/src/main/java/com/mars/iserver/util/ResponseUtil.java @@ -1,4 +1,4 @@ -package com.mars.tomcat.util; +package com.mars.iserver.util; import com.mars.common.util.MesUtil; import com.mars.server.server.request.HttpMarsResponse; diff --git a/mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java b/mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java index 5bd40fa..c9a5d95 100644 --- a/mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java +++ b/mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java @@ -2,7 +2,7 @@ package com.mars.start.base; import com.mars.common.util.MarsConfiguration; import com.mars.jdbc.load.InitJdbc; -import com.mars.tomcat.server.MarsServer; +import com.mars.iserver.server.MarsServer; import com.mars.start.startmap.StartMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory;