From 348e86079aee7117527fd38576efe8ec49703aaa Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sat, 22 Feb 2025 17:37:40 +0800 Subject: [PATCH] refactor: move members --- .../reajason/javaweb/memshell/ShellType.java | 20 +++++- .../javaweb/memshell/server/BesShell.java | 25 +++---- .../memshell/server/GlassFishShell.java | 21 +++--- .../memshell/server/InforSuiteShell.java | 21 +++--- .../javaweb/memshell/server/JbossShell.java | 21 +++--- .../javaweb/memshell/server/JettyShell.java | 11 ++- .../javaweb/memshell/server/ResinShell.java | 1 - .../memshell/server/SpringWebFluxShell.java | 31 ++++---- .../memshell/server/SpringWebMvcShell.java | 64 ++++++++--------- .../javaweb/memshell/server/TomcatShell.java | 24 +++---- .../memshell/server/TongWeb6Shell.java | 21 +++--- .../memshell/server/TongWeb7Shell.java | 21 +++--- .../memshell/server/WebLogicShell.java | 11 ++- .../memshell/server/WebSphereShell.java | 11 ++- .../integration/ShellAssertionTool.java | 8 +-- .../glassfish/GlassFish3ContainerTest.java | 6 +- .../glassfish/GlassFish4ContainerTest.java | 8 +-- .../glassfish/GlassFish501ContainerTest.java | 8 +-- .../glassfish/GlassFish510ContainerTest.java | 8 +-- .../glassfish/GlassFish6ContainerTest.java | 6 +- .../glassfish/GlassFish7ContainerTest.java | 6 +- .../jbossas/Jboss423ContainerTest.java | 8 +-- .../jbossas/Jboss510ContainerTest.java | 6 +- .../jbossas/Jboss610ContainerTest.java | 8 +-- .../jbossas/Jboss711ContainerTest.java | 8 +-- .../jbosseap/JbossEap6ContainerTest.java | 8 +-- .../jbosseap/JbossEap7ContainerTest.java | 9 ++- .../jetty/Jetty10ContainerTest.java | 7 +- .../jetty/Jetty11ContainerTest.java | 7 +- .../jetty/Jetty76ContainerTest.java | 9 ++- .../jetty/Jetty81ContainerTest.java | 9 ++- .../jetty/Jetty92ContainerTest.java | 9 ++- .../jetty/Jetty93ContainerTest.java | 9 ++- .../jetty/Jetty94ContainerTest.java | 9 ++- .../payara/Payara5201ContainerTest.java | 8 +-- .../payara/Payara520225ContainerTest.java | 8 +-- .../payara/Payara620222ContainerTest.java | 6 +- .../resin/Resin3116ContainerTest.java | 9 ++- .../resin/Resin318ContainerTest.java | 9 ++- .../resin/Resin4058ContainerTest.java | 9 ++- .../resin/Resin4067ContainerTest.java | 9 ++- .../springmvc/SpringBoot2ContainerTest.java | 70 +++++++++---------- .../SpringBoot2WarContainerTest.java | 50 ++++++------- .../springmvc/SpringBoot3ContainerTest.java | 24 +++---- .../SpringBoot2WebFluxContainerTest.java | 20 +++--- .../SpringBoot3WebFluxContainerTest.java | 20 +++--- .../tomcat/Tomcat10ContainerTest.java | 6 +- .../tomcat/Tomcat11ContainerTest.java | 6 +- .../tomcat/Tomcat11JRE21ContainerTest.java | 6 +- .../tomcat/Tomcat6ContainerTest.java | 8 +-- .../tomcat/Tomcat7ContainerTest.java | 8 +-- .../tomcat/Tomcat8ContainerTest.java | 8 +-- .../tomcat/Tomcat9ContainerTest.java | 8 +-- .../weblogic/WebLogic1036ContainerTest.java | 9 ++- .../weblogic/WebLogic12214ContainerTest.java | 9 ++- .../weblogic/WebLogic14110ContainerTest.java | 9 ++- .../websphere/WebSphere855ContainerTest.java | 9 ++- .../websphere/WebSphere905ContainerTest.java | 9 ++- .../websphere7/WebSphere700ContainerTest.java | 9 ++- .../wildfly/Wildfly18ContainerTest.java | 9 ++- .../wildfly/Wildfly23ContainerTest.java | 9 ++- .../wildfly/Wildfly30ContainerTest.java | 7 +- .../wildfly/Wildfly9ContainerTest.java | 7 +- 63 files changed, 412 insertions(+), 425 deletions(-) diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/ShellType.java b/generator/src/main/java/com/reajason/javaweb/memshell/ShellType.java index 861aca81..368764ce 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/ShellType.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/ShellType.java @@ -16,7 +16,25 @@ public class ShellType { public static final String VALVE = "Valve"; public static final String JAKARTA_VALVE = "JakartaValve"; + public static final String NETTY_HANDLER = "NettyHandler"; + public static final String AGENT = "Agent"; + public static final String AGENT_FILTER_CHAIN = AGENT + "FilterChain"; - public static final String AGENT_CONTEXT_VALVE = AGENT + "ContextValve"; + public static final String CATALINA_AGENT_CONTEXT_VALVE = AGENT + "ContextValve"; + public static final String JETTY_AGENT_HANDLER = AGENT + "Handler"; + public static final String UNDERTOW_AGENT_SERVLET_HANDLER = AGENT + "ServletHandler"; + public static final String WAS_AGENT_FILTER_MANAGER = AGENT + "FilterManager"; + public static final String WEBLOGIC_AGENT_SERVLET_CONTEXT = AGENT + "ServletContext"; + + public static final String SPRING_WEBMVC_INTERCEPTOR = "Interceptor"; + public static final String SPRING_WEBMVC_JAKARTA_INTERCEPTOR = "JakartaInterceptor"; + public static final String SPRING_WEBMVC_CONTROLLER_HANDLER = "ControllerHandler"; + public static final String SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER = "JakartaControllerHandler"; + public static final String SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET = "AgentFrameworkServlet"; + + public static final String SPRING_WEBFLUX_WEB_FILTER = "WebFilter"; + public static final String SPRING_WEBFLUX_HANDLER_METHOD = "HandlerMethod"; + public static final String SPRING_WEBFLUX_HANDLER_FUNCTION = "HandlerFunction"; + public static final String WEBSOCKET = "WebSocket"; } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java index 171f1b15..dcb6b3e6 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.bes.antsword.AntSwordValve; import com.reajason.javaweb.memshell.bes.behinder.BehinderValve; import com.reajason.javaweb.memshell.bes.command.CommandValve; @@ -32,8 +33,8 @@ public class BesShell extends AbstractShell { .addInjector(FILTER, BesFilterInjector.class) .addInjector(LISTENER, BesListenerInjector.class) .addInjector(VALVE, BesValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, BesContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, BesContextValveAgentInjector.class) .build(); } @@ -43,40 +44,40 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Command)) .addShellClass(VALVE, CommandValve.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla)) .addShellClass(VALVE, GodzillaValve.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder)) .addShellClass(VALVE, BehinderValve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() .addShellClass(FILTER, Suo5Filter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Suo5)) .addShellClass(VALVE, Suo5Valve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.AntSword, ToolMapping.builder() .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.AntSword)) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java index cba68d13..77fabb14 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.glassfish.injector.GlassFishFilterInjector; import com.reajason.javaweb.memshell.glassfish.injector.GlassFishListenerInjector; @@ -59,8 +60,8 @@ public class GlassFishShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class) .addInjector(VALVE, GlassFishValveInjector.class) .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -75,8 +76,8 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); Class godzillaListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Godzilla); @@ -87,8 +88,8 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Behinder); @@ -99,8 +100,8 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Suo5); @@ -118,8 +119,8 @@ public class GlassFishShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java index 3c7466b1..1e678837 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.glassfish.injector.GlassFishListenerInjector; import com.reajason.javaweb.memshell.glassfish.injector.GlassFishValveInjector; @@ -39,8 +40,8 @@ public class InforSuiteShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class) .addInjector(VALVE, GlassFishValveInjector.class) .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -54,8 +55,8 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); Class godzillaListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla); @@ -66,8 +67,8 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder); @@ -78,8 +79,8 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Suo5); @@ -97,8 +98,8 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java index 4f9c4d52..82244052 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.jboss.injector.JbossFilterInjector; import com.reajason.javaweb.memshell.jboss.injector.JbossListenerInjector; @@ -36,8 +37,8 @@ public class JbossShell extends AbstractShell { .addInjector(FILTER, JbossFilterInjector.class) .addInjector(LISTENER, JbossListenerInjector.class) .addInjector(VALVE, JbossValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -47,24 +48,24 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Command)) .addShellClass(VALVE, CommandValve.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla)) .addShellClass(VALVE, GodzillaValve.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder)) .addShellClass(VALVE, BehinderValve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() @@ -77,8 +78,8 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.AntSword)) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/JettyShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/JettyShell.java index 78dde0a9..c7cac09f 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/JettyShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/JettyShell.java @@ -31,7 +31,6 @@ import static com.reajason.javaweb.memshell.ShellType.*; * @since 2024/12/7 */ public class JettyShell extends AbstractShell { - public static final String AGENT_HANDLER = AGENT + "Handler"; public static class ListenerInterceptor { @@ -54,7 +53,7 @@ public class JettyShell extends AbstractShell { .addInjector(JAKARTA_FILTER, JettyFilterInjector.class) .addInjector(LISTENER, JettyListenerInjector.class) .addInjector(JAKARTA_LISTENER, JettyListenerInjector.class) - .addInjector(AGENT_HANDLER, JettyHandlerAgentInjector.class) + .addInjector(JETTY_AGENT_HANDLER, JettyHandlerAgentInjector.class) .build(); } @@ -68,7 +67,7 @@ public class JettyShell extends AbstractShell { .addShellClass(JAKARTA_FILTER, CommandFilter.class) .addShellClass(LISTENER, commandListenerClass) .addShellClass(JAKARTA_LISTENER, commandListenerClass) - .addShellClass(AGENT_HANDLER, CommandHandlerAdvisor.class) + .addShellClass(JETTY_AGENT_HANDLER, CommandHandlerAdvisor.class) .build()); Class godzillaListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Godzilla); @@ -79,7 +78,7 @@ public class JettyShell extends AbstractShell { .addShellClass(JAKARTA_FILTER, GodzillaFilter.class) .addShellClass(LISTENER, godzillaListenerClass) .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) - .addShellClass(AGENT_HANDLER, GodzillaHandlerAdvisor.class) + .addShellClass(JETTY_AGENT_HANDLER, GodzillaHandlerAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Behinder); @@ -90,7 +89,7 @@ public class JettyShell extends AbstractShell { .addShellClass(JAKARTA_FILTER, BehinderFilter.class) .addShellClass(LISTENER, behinderListenerClass) .addShellClass(JAKARTA_LISTENER, behinderListenerClass) - .addShellClass(AGENT_HANDLER, BehinderHandlerAdvisor.class) + .addShellClass(JETTY_AGENT_HANDLER, BehinderHandlerAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Suo5); @@ -108,7 +107,7 @@ public class JettyShell extends AbstractShell { .addShellClass(SERVLET, AntSwordServlet.class) .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) - .addShellClass(AGENT_HANDLER, AntSwordHandlerAdvisor.class) + .addShellClass(JETTY_AGENT_HANDLER, AntSwordHandlerAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/ResinShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/ResinShell.java index 7022f836..5e48f86d 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/ResinShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/ResinShell.java @@ -31,7 +31,6 @@ import static com.reajason.javaweb.memshell.ShellType.*; * @since 2024/12/14 */ public class ResinShell extends AbstractShell { - public static final String AGENT_FILTER_CHAIN = AGENT + "FilterChain"; public static class ListenerInterceptor { @Advice.OnMethodExit diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java index dc97f521..6a1544c5 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerFunction; import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerMethod; import com.reajason.javaweb.memshell.springwebflux.command.CommandNettyHandler; @@ -20,39 +21,35 @@ import com.reajason.javaweb.memshell.springwebflux.suo5.Suo5WebFilter; * @since 2024/12/24 */ public class SpringWebFluxShell extends AbstractShell { - public static final String WEB_FILTER = "WebFilter"; - public static final String HANDLER_METHOD = "HandlerMethod"; - public static final String HANDLER_FUNCTION = "HandlerFunction"; - public static final String NETTY_HANDLER = "NettyHandler"; @Override protected InjectorMapping getShellInjectorMapping() { return InjectorMapping.builder() - .addInjector(WEB_FILTER, SpringWebFluxWebFilterInjector.class) - .addInjector(HANDLER_METHOD, SpringWebFluxHandlerMethodInjector.class) - .addInjector(HANDLER_FUNCTION, SpringWebFluxHandlerFunctionInjector.class) - .addInjector(NETTY_HANDLER, SpringWebFluxNettyHandlerInjector.class) + .addInjector(ShellType.SPRING_WEBFLUX_WEB_FILTER, SpringWebFluxWebFilterInjector.class) + .addInjector(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, SpringWebFluxHandlerMethodInjector.class) + .addInjector(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, SpringWebFluxHandlerFunctionInjector.class) + .addInjector(ShellType.NETTY_HANDLER, SpringWebFluxNettyHandlerInjector.class) .build(); } @Override protected void init() { addToolMapping(ShellTool.Command, ToolMapping.builder() - .addShellClass(WEB_FILTER, CommandWebFilter.class) - .addShellClass(HANDLER_METHOD, CommandHandlerMethod.class) - .addShellClass(HANDLER_FUNCTION, CommandHandlerFunction.class) - .addShellClass(NETTY_HANDLER, CommandNettyHandler.class) + .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class) + .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class) + .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class) + .addShellClass(ShellType.NETTY_HANDLER, CommandNettyHandler.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() - .addShellClass(WEB_FILTER, GodzillaWebFilter.class) - .addShellClass(HANDLER_METHOD, GodzillaHandlerMethod.class) - .addShellClass(HANDLER_FUNCTION, GodzillaHandlerFunction.class) - .addShellClass(NETTY_HANDLER, GodzillaNettyHandler.class) + .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, GodzillaWebFilter.class) + .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, GodzillaHandlerMethod.class) + .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, GodzillaHandlerFunction.class) + .addShellClass(ShellType.NETTY_HANDLER, GodzillaNettyHandler.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() - .addShellClass(WEB_FILTER, Suo5WebFilter.class) + .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, Suo5WebFilter.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java index 378ddec3..fa005b71 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordControllerHandler; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordInterceptor; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordServletAdvisor; @@ -24,62 +25,57 @@ import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor; * @since 2024/12/22 */ public class SpringWebMvcShell extends AbstractShell { - public static final String INTERCEPTOR = "Interceptor"; - public static final String JAKARTA_INTERCEPTOR = "JakartaInterceptor"; - public static final String CONTROLLER_HANDLER = "ControllerHandler"; - public static final String JAKARTA_CONTROLLER_HANDLER = "JakartaControllerHandler"; - public static final String AGENT_FRAMEWORK_SERVLET = "AgentFrameworkServlet"; @Override protected InjectorMapping getShellInjectorMapping() { return InjectorMapping.builder() - .addInjector(INTERCEPTOR, SpringWebMvcInterceptorInjector.class) - .addInjector(JAKARTA_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) - .addInjector(CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) - .addInjector(JAKARTA_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) - .addInjector(AGENT_FRAMEWORK_SERVLET, SpringWebMvcFrameworkServletAgentInjector.class) + .addInjector(ShellType.SPRING_WEBMVC_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) + .addInjector(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) + .addInjector(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) + .addInjector(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) + .addInjector(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, SpringWebMvcFrameworkServletAgentInjector.class) .build(); } @Override protected void init() { addToolMapping(ShellTool.Command, ToolMapping.builder() - .addShellClass(INTERCEPTOR, CommandInterceptor.class) - .addShellClass(JAKARTA_INTERCEPTOR, CommandInterceptor.class) - .addShellClass(CONTROLLER_HANDLER, CommandControllerHandler.class) - .addShellClass(JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class) - .addShellClass(AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class) + .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() - .addShellClass(INTERCEPTOR, GodzillaInterceptor.class) - .addShellClass(JAKARTA_INTERCEPTOR, GodzillaInterceptor.class) - .addShellClass(CONTROLLER_HANDLER, GodzillaControllerHandler.class) - .addShellClass(JAKARTA_CONTROLLER_HANDLER, GodzillaControllerHandler.class) - .addShellClass(AGENT_FRAMEWORK_SERVLET, GodzillaServletAdvisor.class) + .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, GodzillaInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, GodzillaInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, GodzillaControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, GodzillaControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, GodzillaServletAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() - .addShellClass(INTERCEPTOR, BehinderInterceptor.class) - .addShellClass(JAKARTA_INTERCEPTOR, BehinderInterceptor.class) - .addShellClass(CONTROLLER_HANDLER, BehinderControllerHandler.class) - .addShellClass(JAKARTA_CONTROLLER_HANDLER, BehinderControllerHandler.class) - .addShellClass(AGENT_FRAMEWORK_SERVLET, BehinderServletAdvisor.class) + .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, BehinderInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, BehinderInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, BehinderControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, BehinderControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, BehinderServletAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() - .addShellClass(INTERCEPTOR, Suo5Interceptor.class) - .addShellClass(JAKARTA_INTERCEPTOR, Suo5Interceptor.class) - .addShellClass(CONTROLLER_HANDLER, Suo5ControllerHandler.class) - .addShellClass(JAKARTA_CONTROLLER_HANDLER, Suo5ControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, Suo5Interceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, Suo5Interceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, Suo5ControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, Suo5ControllerHandler.class) .build()); addToolMapping(ShellTool.AntSword, ToolMapping.builder() - .addShellClass(INTERCEPTOR, AntSwordInterceptor.class) - .addShellClass(JAKARTA_INTERCEPTOR, AntSwordInterceptor.class) - .addShellClass(CONTROLLER_HANDLER, AntSwordControllerHandler.class) - .addShellClass(JAKARTA_CONTROLLER_HANDLER, AntSwordControllerHandler.class) - .addShellClass(AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class) + .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, AntSwordInterceptor.class) + .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, AntSwordControllerHandler.class) + .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class) .build()); } } \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java index 6606ecd8..a294b2bd 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilter; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilterChainAdvisor; @@ -30,9 +31,6 @@ import static com.reajason.javaweb.memshell.ShellType.*; * @since 2024/11/22 */ public class TomcatShell extends AbstractShell { - public static final String WEBSOCKET = "WebSocket"; - public static final String UPGRADE = "Upgrade"; - public static final String EXECUTOR = "Executor"; public static class ListenerInterceptor { @@ -57,8 +55,8 @@ public class TomcatShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TomcatListenerInjector.class) .addInjector(VALVE, TomcatValveInjector.class) .addInjector(JAKARTA_VALVE, TomcatValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .addInjector(WEBSOCKET, TomcatWebSocketInjector.class) .build(); } @@ -75,8 +73,8 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .addShellClass(WEBSOCKET, CommandWebSocket.class) .build()); @@ -90,8 +88,8 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Behinder); @@ -104,8 +102,8 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Suo5); @@ -126,8 +124,8 @@ public class TomcatShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java index 06e4c4a8..24f78f3f 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilter; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilterChainAdvisor; @@ -35,8 +36,8 @@ public class TongWeb6Shell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TongWebListenerInjector.class) .addInjector(VALVE, TongWebValveInjector.class) .addInjector(JAKARTA_VALVE, TongWebValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) .build(); } @@ -51,8 +52,8 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve6.class) .addShellClass(JAKARTA_VALVE, CommandValve6.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); Class godzillaListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla); @@ -63,8 +64,8 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve6.class) .addShellClass(JAKARTA_VALVE, GodzillaValve6.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder); @@ -75,8 +76,8 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve6.class) .addShellClass(JAKARTA_VALVE, BehinderValve6.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Suo5); @@ -94,8 +95,8 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve6.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java index 6b514910..d74e29a6 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java @@ -1,6 +1,7 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.generator.ListenerGenerator; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilter; import com.reajason.javaweb.memshell.shelltool.antsword.AntSwordFilterChainAdvisor; @@ -34,8 +35,8 @@ public class TongWeb7Shell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TongWebListenerInjector.class) .addInjector(VALVE, TongWebValveInjector.class) .addInjector(JAKARTA_VALVE, TongWebValveInjector.class) - .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) - .addInjector(AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) + .addInjector(ShellType.AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) + .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) .build(); } @@ -50,8 +51,8 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve7.class) .addShellClass(JAKARTA_VALVE, CommandValve7.class) - .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); Class godzillaListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla); @@ -62,8 +63,8 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve7.class) .addShellClass(JAKARTA_VALVE, GodzillaValve7.class) - .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); Class behinderListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder); @@ -74,8 +75,8 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve7.class) .addShellClass(JAKARTA_VALVE, BehinderValve7.class) - .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); Class suo5ListenerClass = ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Suo5); @@ -93,8 +94,8 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve7.class) - .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) - .addShellClass(AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) + .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/WebLogicShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/WebLogicShell.java index 6a8eb6d3..e19dafa9 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/WebLogicShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/WebLogicShell.java @@ -28,7 +28,6 @@ import static com.reajason.javaweb.memshell.ShellType.*; * @since 2024/12/24 */ public class WebLogicShell extends AbstractShell { - public static final String AGENT_SERVLET_CONTEXT = AGENT + "ServletContext"; @Override protected InjectorMapping getShellInjectorMapping() { @@ -36,7 +35,7 @@ public class WebLogicShell extends AbstractShell { .addInjector(SERVLET, WebLogicServletInjector.class) .addInjector(FILTER, WebLogicFilterInjector.class) .addInjector(LISTENER, WebLogicListenerInjector.class) - .addInjector(AGENT_SERVLET_CONTEXT, WebLogicServletContextAgentInjector.class) + .addInjector(WEBLOGIC_AGENT_SERVLET_CONTEXT, WebLogicServletContextAgentInjector.class) .build(); } @@ -46,21 +45,21 @@ public class WebLogicShell extends AbstractShell { .addShellClass(SERVLET, CommandServlet.class) .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Command)) - .addShellClass(AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class) + .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, CommandFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() .addShellClass(SERVLET, GodzillaServlet.class) .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla)) - .addShellClass(AGENT_SERVLET_CONTEXT, GodzillaFilterChainAdvisor.class) + .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, GodzillaFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() .addShellClass(SERVLET, BehinderServlet.class) .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder)) - .addShellClass(AGENT_SERVLET_CONTEXT, BehinderFilterChainAdvisor.class) + .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, BehinderFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() @@ -73,7 +72,7 @@ public class WebLogicShell extends AbstractShell { .addShellClass(SERVLET, AntSwordServlet.class) .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.AntSword)) - .addShellClass(AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class) + .addShellClass(WEBLOGIC_AGENT_SERVLET_CONTEXT, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/WebSphereShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/WebSphereShell.java index 98be61e3..2b9fb56b 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/WebSphereShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/WebSphereShell.java @@ -31,7 +31,6 @@ import static com.reajason.javaweb.memshell.ShellType.*; * @since 2024/12/21 */ public class WebSphereShell extends AbstractShell { - public static final String AGENT_FILTER_MANAGER = AGENT + "FilterManager"; public static class ListenerInterceptor { @@ -47,7 +46,7 @@ public class WebSphereShell extends AbstractShell { .addInjector(SERVLET, WebSphereServletInjector.class) .addInjector(FILTER, WebSphereFilterInjector.class) .addInjector(LISTENER, WebSphereListenerInjector.class) - .addInjector(AGENT_FILTER_MANAGER, WebSphereFilterChainAgentInjector.class) + .addInjector(WAS_AGENT_FILTER_MANAGER, WebSphereFilterChainAgentInjector.class) .build(); } @@ -57,21 +56,21 @@ public class WebSphereShell extends AbstractShell { .addShellClass(SERVLET, CommandServlet.class) .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Command)) - .addShellClass(AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class) + .addShellClass(WAS_AGENT_FILTER_MANAGER, CommandFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() .addShellClass(SERVLET, GodzillaServlet.class) .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Godzilla)) - .addShellClass(AGENT_FILTER_MANAGER, GodzillaFilterChainAdvisor.class) + .addShellClass(WAS_AGENT_FILTER_MANAGER, GodzillaFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() .addShellClass(SERVLET, BehinderServlet.class) .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.Behinder)) - .addShellClass(AGENT_FILTER_MANAGER, BehinderFilterChainAdvisor.class) + .addShellClass(WAS_AGENT_FILTER_MANAGER, BehinderFilterChainAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() @@ -84,7 +83,7 @@ public class WebSphereShell extends AbstractShell { .addShellClass(SERVLET, AntSwordServlet.class) .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(ListenerInterceptor.class, ShellTool.AntSword)) - .addShellClass(AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class) + .addShellClass(WAS_AGENT_FILTER_MANAGER, AntSwordFilterChainAdvisor.class) .build()); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java index c8491c3d..6c387794 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java @@ -7,8 +7,6 @@ import com.reajason.javaweb.behinder.BehinderManager; import com.reajason.javaweb.godzilla.GodzillaManager; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; -import com.reajason.javaweb.memshell.server.SpringWebFluxShell; -import com.reajason.javaweb.memshell.server.SpringWebMvcShell; import com.reajason.javaweb.memshell.config.*; import com.reajason.javaweb.memshell.Packers; import com.reajason.javaweb.memshell.packer.jar.JarPacker; @@ -52,9 +50,9 @@ public class ShellAssertionTool { String urlPattern = null; if (shellType.endsWith(ShellType.SERVLET) - || shellType.endsWith(SpringWebMvcShell.CONTROLLER_HANDLER) - || shellType.equals(SpringWebFluxShell.HANDLER_METHOD) - || shellType.equals(SpringWebFluxShell.HANDLER_FUNCTION) + || shellType.endsWith(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER) + || shellType.equals(ShellType.SPRING_WEBFLUX_HANDLER_METHOD) + || shellType.equals(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION) ) { urlPattern = "/" + shellTool + shellType + packer.name(); shellUrl = url + urlPattern; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java index e49cc5e3..8cca9f94 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java @@ -83,10 +83,10 @@ public class GlassFish3ContainerTest { // arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar), // classFormatError arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), // arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java index b04f75f6..599e94b6 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java @@ -84,10 +84,10 @@ public class GlassFish4ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java index 3e3319ab..a6ce77d5 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java @@ -76,10 +76,10 @@ public class GlassFish501ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java index b02e0adc..a9b547cc 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java @@ -88,10 +88,10 @@ public class GlassFish510ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java index 3580b971..00d740b2 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java @@ -70,9 +70,9 @@ public class GlassFish6ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java index 0687354e..815809ec 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java @@ -58,9 +58,9 @@ public class GlassFish7ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java index a04a3ac1..79aed82f 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java @@ -76,10 +76,10 @@ public class Jboss423ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java index 9733d99e..ddb61bcd 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java @@ -77,10 +77,10 @@ public class Jboss510ContainerTest { // arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), // arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java index 83a47b60..676cd300 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java @@ -76,10 +76,10 @@ public class Jboss610ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java index c8555089..3e184693 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java @@ -64,10 +64,10 @@ public class Jboss711ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java index 3d5ea74d..1261d874 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java @@ -61,10 +61,10 @@ public class JbossEap6ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java index e280ee32..9cbdb16c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jbosseap; -import com.reajason.javaweb.memshell.server.UndertowShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -73,10 +72,10 @@ public class JbossEap7ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.ScriptEngine), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.ScriptEngine), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java index 655a1fb4..7108fb2d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -66,9 +65,9 @@ public class Jetty10ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)); + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)); } @AfterAll diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java index a67020b5..edb86313 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -66,9 +65,9 @@ public class Jetty11ContainerTest { arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Command, Packers.JavaDeserialize), arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java index 65b427b4..9cc317f0 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Jetty76ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java index b6e012a6..61c0c440 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Jetty81ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java index fb986880..0e2a62c5 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -73,10 +72,10 @@ public class Jetty92ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java index 9f674240..de855108 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Jetty93ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java index 0d86c6f0..3a00f919 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.jetty; -import com.reajason.javaweb.memshell.server.JettyShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Jetty94ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.JETTY_AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java index eed7adfe..96ffbf6b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java @@ -92,10 +92,10 @@ public class Payara5201ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java index b7ec535c..10aad31b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java @@ -77,10 +77,10 @@ public class Payara520225ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java index d5359d7c..06bf255d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java @@ -69,9 +69,9 @@ public class Payara620222ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java index 228dbbb4..5514ccf7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.resin; -import com.reajason.javaweb.memshell.server.ResinShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -73,10 +72,10 @@ public class Resin3116ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java index 85b397c2..5a8769d2 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.resin; -import com.reajason.javaweb.memshell.server.ResinShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -73,10 +72,10 @@ public class Resin318ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java index dd2478f7..18c9c83d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.resin; -import com.reajason.javaweb.memshell.server.ResinShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Resin4058ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java index ac58d00e..76053518 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.resin; -import com.reajason.javaweb.memshell.server.ResinShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -72,10 +71,10 @@ public class Resin4067ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JavaDeserialize), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JavaDeserialize), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java index a42d021c..d1b31d01 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.integration.springmvc; -import com.reajason.javaweb.memshell.server.SpringWebMvcShell; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.Packers; @@ -43,40 +43,40 @@ public class SpringBoot2ContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.AntSword, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.AntSword, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.AntSword, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.AntSword, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.AntSword, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.AntSword, Packers.Base64), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.AntSword, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.AntSword, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.AntSword, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.AntSword, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.AntSword, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.AntSword, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java index 868a16e0..76845f14 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.integration.springmvc; -import com.reajason.javaweb.memshell.server.SpringWebMvcShell; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.Packers; @@ -41,30 +41,30 @@ public class SpringBoot2WarContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.ScriptEngine), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.SpEL), - arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64) + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_INTERCEPTOR, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.ScriptEngine), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.SpEL), + arguments(imageName, ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java index 1db7f858..8566b470 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.integration.springmvc; -import com.reajason.javaweb.memshell.server.SpringWebMvcShell; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.Packers; @@ -43,17 +43,17 @@ public class SpringBoot3ContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar) + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java index d5afa2c1..0bb588ff 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.integration.springwebflux; -import com.reajason.javaweb.memshell.server.SpringWebFluxShell; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.Packers; @@ -41,15 +41,15 @@ public class SpringBoot2WebFluxContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packers.Base64) + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_METHOD, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Command, Packers.Base64) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java index 014d11d6..a51bfcd6 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.integration.springwebflux; -import com.reajason.javaweb.memshell.server.SpringWebFluxShell; +import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.Packers; @@ -41,15 +41,15 @@ public class SpringBoot3WebFluxContainerTest { static Stream casesProvider() { return Stream.of( - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Suo5, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packers.Base64), - arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64), - arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packers.Base64) + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_WEB_FILTER, ShellTool.Suo5, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_METHOD, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, ShellTool.Command, Packers.Base64), + arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64), + arguments(imageName, ShellType.NETTY_HANDLER, ShellTool.Command, Packers.Base64) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java index 38c1c699..cee8acb5 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java @@ -92,9 +92,9 @@ public class Tomcat10ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java index 6a177606..a98f0e56 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java @@ -61,9 +61,9 @@ public class Tomcat11ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java index 291f424e..172c2b66 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java @@ -61,9 +61,9 @@ public class Tomcat11JRE21ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java index a48be659..d23e187e 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java @@ -86,10 +86,10 @@ public class Tomcat6ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java index 1d108064..8e4a4f16 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java @@ -86,10 +86,10 @@ public class Tomcat7ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java index 02167922..6e0c91ac 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java @@ -106,10 +106,10 @@ public class Tomcat8ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java index aff1fa7b..64e0aeb4 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java @@ -85,10 +85,10 @@ public class Tomcat9ContainerTest { arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar), arguments(imageName, ShellType.AGENT_FILTER_CHAIN, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, ShellType.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.CATALINA_AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java index a200bd21..a8c62a56 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.weblogic; -import com.reajason.javaweb.memshell.server.WebLogicShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -55,10 +54,10 @@ public class WebLogic1036ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.Base64), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java index d44ef1db..2bd97cab 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.weblogic; -import com.reajason.javaweb.memshell.server.WebLogicShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -57,10 +56,10 @@ public class WebLogic12214ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.Base64), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java index ed614826..cf681305 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.weblogic; -import com.reajason.javaweb.memshell.server.WebLogicShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -57,10 +56,10 @@ public class WebLogic14110ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.Base64), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.Base64), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WEBLOGIC_AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java index 2a4a4ddd..c7cc30fe 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.websphere; -import com.reajason.javaweb.memshell.server.WebSphereShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -60,10 +59,10 @@ public class WebSphere855ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java index 80e3d103..a27b490a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.websphere; -import com.reajason.javaweb.memshell.server.WebSphereShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -60,10 +59,10 @@ public class WebSphere905ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere7/WebSphere700ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere7/WebSphere700ContainerTest.java index c9a213f9..c59f2094 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/websphere7/WebSphere700ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/websphere7/WebSphere700ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.websphere7; -import com.reajason.javaweb.memshell.server.WebSphereShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -60,10 +59,10 @@ public class WebSphere700ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.WAS_AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java index 24c11267..e16b03d3 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.wildfly; -import com.reajason.javaweb.memshell.server.UndertowShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -58,10 +57,10 @@ public class Wildfly18ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java index f9ee25a3..64b37a32 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.wildfly; -import com.reajason.javaweb.memshell.server.UndertowShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -58,10 +57,10 @@ public class Wildfly23ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.Suo5, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java index 212e3d54..4c15a712 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.wildfly; -import com.reajason.javaweb.memshell.server.UndertowShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -55,9 +54,9 @@ public class Wildfly30ContainerTest { arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP), arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP), arguments(imageName, ShellType.JAKARTA_LISTENER, ShellTool.Suo5, Packers.JSP), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar) ); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java index 92a26e68..146e16a9 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.integration.wildfly; -import com.reajason.javaweb.memshell.server.UndertowShell; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; @@ -77,9 +76,9 @@ public class Wildfly9ContainerTest { arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.JSP), arguments(imageName, ShellType.LISTENER, ShellTool.AntSword, Packers.ScriptEngine), // arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), - arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar) + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar), + arguments(imageName, ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar) ); }