Skip to content

Commit 9494e43

Browse files
committed
refactor: merge JBossAS and GlassFish
1 parent 69f2153 commit 9494e43

File tree

13 files changed

+68
-1058
lines changed

13 files changed

+68
-1058
lines changed

generator/src/main/java/com/reajason/javaweb/memshell/Server.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public enum Server {
2929
/**
3030
* JBoss AS 中间件,JBoss 6.4-EAP 也使用的当前方式 <a href="https://jbossas.jboss.org/downloads">JBoss AS</a>
3131
*/
32-
JBossAS(new JbossShell()),
33-
JBossEAP6(new JbossShell()),
32+
JBossAS(new TomcatShell()),
33+
JBossEAP6(new TomcatShell()),
3434
/**
3535
* Undertow,对应是 Wildfly 以及 JBoss EAP,也有可能是 SpringBoot 用的
3636
* <a href="https://developers.redhat.com/products/eap/download">JBossEAP</a>

generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.reajason.javaweb.memshell.server;
22

3-
import com.reajason.javaweb.memshell.injector.glassfish.GlassFishFilterInjector;
4-
import com.reajason.javaweb.memshell.injector.glassfish.GlassFishListenerInjector;
53
import com.reajason.javaweb.memshell.injector.glassfish.GlassFishValveInjector;
64
import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentInjector;
75
import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentInjector;
6+
import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterInjector;
7+
import com.reajason.javaweb.memshell.injector.tomcat.TomcatListenerInjector;
88
import com.reajason.javaweb.memshell.utils.ShellCommonUtil;
99
import net.bytebuddy.asm.Advice;
10-
import net.bytebuddy.implementation.bytecode.assign.Assigner;
1110

1211
import static com.reajason.javaweb.memshell.ShellType.*;
1312

@@ -42,10 +41,10 @@ public Class<?> getListenerInterceptor() {
4241
@Override
4342
public InjectorMapping getShellInjectorMapping() {
4443
return InjectorMapping.builder()
45-
.addInjector(LISTENER, GlassFishListenerInjector.class)
46-
.addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class)
47-
.addInjector(FILTER, GlassFishFilterInjector.class)
48-
.addInjector(JAKARTA_FILTER, GlassFishFilterInjector.class)
44+
.addInjector(LISTENER, TomcatListenerInjector.class)
45+
.addInjector(JAKARTA_LISTENER, TomcatListenerInjector.class)
46+
.addInjector(FILTER, TomcatFilterInjector.class)
47+
.addInjector(JAKARTA_FILTER, TomcatFilterInjector.class)
4948
.addInjector(VALVE, GlassFishValveInjector.class)
5049
.addInjector(JAKARTA_VALVE, GlassFishValveInjector.class)
5150
.addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class)

generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.reajason.javaweb.memshell.server;
22

3-
import com.reajason.javaweb.memshell.injector.glassfish.GlassFishListenerInjector;
43
import com.reajason.javaweb.memshell.injector.glassfish.GlassFishValveInjector;
54
import com.reajason.javaweb.memshell.injector.inforsuite.InforSuiteFilterInjector;
65
import com.reajason.javaweb.memshell.injector.tomcat.TomcatContextValveAgentInjector;
76
import com.reajason.javaweb.memshell.injector.tomcat.TomcatFilterChainAgentInjector;
7+
import com.reajason.javaweb.memshell.injector.tomcat.TomcatListenerInjector;
88

99
import static com.reajason.javaweb.memshell.ShellType.*;
1010

@@ -22,8 +22,8 @@ public Class<?> getListenerInterceptor() {
2222
@Override
2323
public InjectorMapping getShellInjectorMapping() {
2424
return InjectorMapping.builder()
25-
.addInjector(LISTENER, GlassFishListenerInjector.class)
26-
.addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class)
25+
.addInjector(LISTENER, TomcatListenerInjector.class)
26+
.addInjector(JAKARTA_LISTENER, TomcatListenerInjector.class)
2727
.addInjector(FILTER, InforSuiteFilterInjector.class)
2828
.addInjector(JAKARTA_FILTER, InforSuiteFilterInjector.class)
2929
.addInjector(VALVE, GlassFishValveInjector.class)

generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

memshell/src/main/java/com/reajason/javaweb/memshell/injector/glassfish/GlassFishFilterInjector.java

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)