From 5cd4d26066677202eac713f198125f96a808aa80 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Thu, 26 May 2022 17:46:04 +0800
Subject: [PATCH] 1.8.1

---
 __test/pom.xml                                | 40 +++++++++----------
 ...luginUndertow.java => UndertowServer.java} |  2 +-
 ...rtowJsp.java => UndertowServerAddJsp.java} |  2 +-
 ...ertowBase.java => UndertowServerBase.java} |  2 +-
 .../noear/solon/boot/undertow/XPluginImp.java |  4 +-
 5 files changed, 25 insertions(+), 25 deletions(-)
 rename _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/{PluginUndertow.java => UndertowServer.java} (98%)
 rename _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/{PluginUndertowJsp.java => UndertowServerAddJsp.java} (96%)
 rename _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/{PluginUndertowBase.java => UndertowServerBase.java} (98%)

diff --git a/__test/pom.xml b/__test/pom.xml
index b2d762b024..625329f10e 100644
--- a/__test/pom.xml
+++ b/__test/pom.xml
@@ -195,20 +195,20 @@
         <!--            <artifactId>solon.boot.socketd.rsocket</artifactId>-->
         <!--        </dependency>-->
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.noear</groupId>-->
-        <!--            <artifactId>solon.boot.socketd.jdksocket</artifactId>-->
-        <!--        </dependency>-->
+                <dependency>
+                    <groupId>org.noear</groupId>
+                    <artifactId>solon.boot.socketd.jdksocket</artifactId>
+                </dependency>
 
         <!--        <dependency>-->
         <!--            <groupId>org.noear</groupId>-->
         <!--            <artifactId>solon.boot.socketd.netty</artifactId>-->
         <!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.noear</groupId>
-            <artifactId>solon.boot.socketd.smartsocket</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.noear</groupId>-->
+<!--            <artifactId>solon.boot.socketd.smartsocket</artifactId>-->
+<!--        </dependency>-->
 
 
         <!--        <dependency>-->
@@ -217,22 +217,22 @@
         <!--        </dependency>-->
 
 
-        <dependency>
-            <groupId>org.noear</groupId>
-            <artifactId>solon.boot.smarthttp</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.noear</groupId>-->
+<!--            <artifactId>solon.boot.smarthttp</artifactId>-->
+<!--        </dependency>-->
 
 
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.noear</groupId>-->
-        <!--            <artifactId>solon.boot.undertow</artifactId>-->
-        <!--        </dependency>-->
+                <dependency>
+                    <groupId>org.noear</groupId>
+                    <artifactId>solon.boot.undertow</artifactId>
+                </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>org.noear</groupId>-->
-        <!--            <artifactId>solon.boot.undertow.add.jsp</artifactId>-->
-        <!--        </dependency>-->
+                <dependency>
+                    <groupId>org.noear</groupId>
+                    <artifactId>solon.boot.undertow.add.jsp</artifactId>
+                </dependency>
 
 
 
diff --git a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertow.java b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServer.java
similarity index 98%
rename from _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertow.java
rename to _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServer.java
index b2229acdd8..372b1d402f 100644
--- a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertow.java
+++ b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServer.java
@@ -24,7 +24,7 @@
  * @author  by: Yukai
  * @since : 2019/3/28 15:49
  */
-class PluginUndertow extends PluginUndertowBase implements ServerLifecycle {
+class UndertowServer extends UndertowServerBase implements ServerLifecycle {
     protected Undertow _server;
 
     @Override
diff --git a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowJsp.java b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerAddJsp.java
similarity index 96%
rename from _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowJsp.java
rename to _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerAddJsp.java
index a6c6bbdfed..a493c928c0 100644
--- a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowJsp.java
+++ b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerAddJsp.java
@@ -18,7 +18,7 @@
  * @author by: Yukai
  * @since: 2019/3/28 15:50
  */
-class PluginUndertowJsp extends PluginUndertow {
+class UndertowServerAddJsp extends UndertowServer {
 
     @Override
     protected HttpHandler buildHandler() throws Exception{
diff --git a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowBase.java b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerBase.java
similarity index 98%
rename from _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowBase.java
rename to _solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerBase.java
index fcf91637fd..c868bb35f1 100644
--- a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/PluginUndertowBase.java
+++ b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/UndertowServerBase.java
@@ -12,7 +12,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
-abstract class PluginUndertowBase {
+abstract class UndertowServerBase {
     protected DeploymentInfo initDeploymentInfo() {
         MultipartConfigElement configElement = new MultipartConfigElement(System.getProperty("java.io.tmpdir"));
 
diff --git a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java
index 02fcdb5d91..8c3d0b9d65 100644
--- a/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java
+++ b/_solon_extend/solon.boot.undertow/src/main/java/org/noear/solon/boot/undertow/XPluginImp.java
@@ -59,9 +59,9 @@ private void start0(SolonApp app) throws Throwable{
         Class<?> jspClz = Utils.loadClass("io.undertow.jsp.JspServletBuilder");
 
         if (jspClz == null) {
-            _server = new PluginUndertow();
+            _server = new UndertowServer();
         } else {
-            _server = new PluginUndertowJsp();
+            _server = new UndertowServerAddJsp();
         }
 
         _server.start(_host, _port);