fix: payara 6/7 shell not work

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara6202312ContainerTest.java

@@ -0,0 +1,60 @@
+package com.reajason.javaweb.integration.memshell.payara;
+
+import com.reajason.javaweb.integration.AbstractContainerTest;
+import com.reajason.javaweb.integration.ContainerTestConfig;
+import com.reajason.javaweb.memshell.ShellTool;
+import com.reajason.javaweb.memshell.ShellType;
+import com.reajason.javaweb.packer.Packers;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202312ContainerTest extends AbstractContainerTest {
+    private static final ContainerTestConfig CONFIG = ContainerTestConfig.glassFish(
+            "payara/server-web:6.2023.12",
+            "/opt/payara/deployments/app.war")
+            .warFile(warJakartaFile)
+            .jakarta(true)
+            .targetJdkVersion(Opcodes.V11)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .assertLogs(false)
+            .supportedShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE,
+                    ShellType.AGENT_FILTER_CHAIN,
+                    ShellType.CATALINA_AGENT_CONTEXT_VALVE
+            ))
+            .testPackers(List.of(Packers.JSP))
+            .unSupportedShellTools(List.of(ShellTool.AntSword))
+            .probeShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE
+            ))
+            .build();
+
+    static Network network = newNetwork();
+    @Container
+    public static final GenericContainer<?> python = buildPythonContainer(network);
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG, network);
+
+    @Override
+    protected ContainerTestConfig getConfig() {
+        return CONFIG;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara6202412ContainerTest.java

@@ -0,0 +1,60 @@
+package com.reajason.javaweb.integration.memshell.payara;
+
+import com.reajason.javaweb.integration.AbstractContainerTest;
+import com.reajason.javaweb.integration.ContainerTestConfig;
+import com.reajason.javaweb.memshell.ShellTool;
+import com.reajason.javaweb.memshell.ShellType;
+import com.reajason.javaweb.packer.Packers;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202412ContainerTest extends AbstractContainerTest {
+    private static final ContainerTestConfig CONFIG = ContainerTestConfig.glassFish(
+            "payara/server-web:6.2024.12-jdk17",
+            "/opt/payara/deployments/app.war")
+            .warFile(warJakartaFile)
+            .jakarta(true)
+            .targetJdkVersion(Opcodes.V11)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .assertLogs(false)
+            .supportedShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE,
+                    ShellType.AGENT_FILTER_CHAIN,
+                    ShellType.CATALINA_AGENT_CONTEXT_VALVE
+            ))
+            .testPackers(List.of(Packers.JSP))
+            .unSupportedShellTools(List.of(ShellTool.AntSword))
+            .probeShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE
+            ))
+            .build();
+
+    static Network network = newNetwork();
+    @Container
+    public static final GenericContainer<?> python = buildPythonContainer(network);
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG, network);
+
+    @Override
+    protected ContainerTestConfig getConfig() {
+        return CONFIG;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara6202511ContainerTest.java

@@ -0,0 +1,60 @@
+package com.reajason.javaweb.integration.memshell.payara;
+
+import com.reajason.javaweb.integration.AbstractContainerTest;
+import com.reajason.javaweb.integration.ContainerTestConfig;
+import com.reajason.javaweb.memshell.ShellTool;
+import com.reajason.javaweb.memshell.ShellType;
+import com.reajason.javaweb.packer.Packers;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202511ContainerTest extends AbstractContainerTest {
+    private static final ContainerTestConfig CONFIG = ContainerTestConfig.glassFish(
+            "payara/server-web:6.2025.11-jdk21",
+            "/opt/payara/deployments/app.war")
+            .warFile(warJakartaFile)
+            .jakarta(true)
+            .targetJdkVersion(Opcodes.V11)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .assertLogs(false)
+            .supportedShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE,
+                    ShellType.AGENT_FILTER_CHAIN,
+                    ShellType.CATALINA_AGENT_CONTEXT_VALVE
+            ))
+            .testPackers(List.of(Packers.JSP))
+            .unSupportedShellTools(List.of(ShellTool.AntSword))
+            .probeShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE
+            ))
+            .build();
+
+    static Network network = newNetwork();
+    @Container
+    public static final GenericContainer<?> python = buildPythonContainer(network);
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG, network);
+
+    @Override
+    protected ContainerTestConfig getConfig() {
+        return CONFIG;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara7202606ContainerTest.java

@@ -0,0 +1,60 @@
+package com.reajason.javaweb.integration.memshell.payara;
+
+import com.reajason.javaweb.integration.AbstractContainerTest;
+import com.reajason.javaweb.integration.ContainerTestConfig;
+import com.reajason.javaweb.memshell.ShellTool;
+import com.reajason.javaweb.memshell.ShellType;
+import com.reajason.javaweb.packer.Packers;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.util.List;
+
+import static com.reajason.javaweb.integration.ContainerTool.warJakartaFile;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara7202606ContainerTest extends AbstractContainerTest {
+    private static final ContainerTestConfig CONFIG = ContainerTestConfig.glassFish(
+            "payara/server-web:7.2026.6",
+            "/opt/payara/deployments/app.war")
+            .warFile(warJakartaFile)
+            .jakarta(true)
+            .targetJdkVersion(Opcodes.V11)
+            .waitStrategy(Wait.forHttp("/app/").forPort(8080).forStatusCode(200))
+            .assertLogs(false)
+            .supportedShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE,
+                    ShellType.AGENT_FILTER_CHAIN,
+                    ShellType.CATALINA_AGENT_CONTEXT_VALVE
+            ))
+            .testPackers(List.of(Packers.JSP))
+            .unSupportedShellTools(List.of(ShellTool.AntSword))
+            .probeShellTypes(List.of(
+                    ShellType.JAKARTA_FILTER,
+                    ShellType.JAKARTA_LISTENER,
+                    ShellType.JAKARTA_VALVE
+            ))
+            .build();
+
+    static Network network = newNetwork();
+    @Container
+    public static final GenericContainer<?> python = buildPythonContainer(network);
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG, network);
+
+    @Override
+    protected ContainerTestConfig getConfig() {
+        return CONFIG;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/probe/payara/Payara6202312ContainerTest.java

@@ -0,0 +1,38 @@
+package com.reajason.javaweb.integration.probe.payara;
+
+import com.reajason.javaweb.integration.probe.AbstractProbeContainerTest;
+import com.reajason.javaweb.integration.probe.ProbeTestConfig;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202312ContainerTest extends AbstractProbeContainerTest {
+
+    private static final ProbeTestConfig CONFIG = ProbeTestConfig.payaraJakarta(
+                    "payara/server-web:6.2023.12",
+                    "/opt/payara/deployments/app.war")
+            .expectedJdkVersion("JDK|11.0.21|55")
+            .targetJdkVersion(Opcodes.V11)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .build();
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG);
+
+    @Override
+    protected ProbeTestConfig getConfig() {
+        return CONFIG;
+    }
+
+    @Override
+    protected GenericContainer<?> getContainer() {
+        return container;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/probe/payara/Payara6202412ContainerTest.java

@@ -0,0 +1,38 @@
+package com.reajason.javaweb.integration.probe.payara;
+
+import com.reajason.javaweb.integration.probe.AbstractProbeContainerTest;
+import com.reajason.javaweb.integration.probe.ProbeTestConfig;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202412ContainerTest extends AbstractProbeContainerTest {
+
+    private static final ProbeTestConfig CONFIG = ProbeTestConfig.payaraJakarta(
+                    "payara/server-web:6.2024.12-jdk17",
+                    "/opt/payara/deployments/app.war")
+            .expectedJdkVersion("JDK|17.0.13|61")
+            .targetJdkVersion(Opcodes.V17)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .build();
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG);
+
+    @Override
+    protected ProbeTestConfig getConfig() {
+        return CONFIG;
+    }
+
+    @Override
+    protected GenericContainer<?> getContainer() {
+        return container;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/probe/payara/Payara6202511ContainerTest.java

@@ -0,0 +1,38 @@
+package com.reajason.javaweb.integration.probe.payara;
+
+import com.reajason.javaweb.integration.probe.AbstractProbeContainerTest;
+import com.reajason.javaweb.integration.probe.ProbeTestConfig;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara6202511ContainerTest extends AbstractProbeContainerTest {
+
+    private static final ProbeTestConfig CONFIG = ProbeTestConfig.payaraJakarta(
+                    "payara/server-web:6.2025.11-jdk21",
+                    "/opt/payara/deployments/app.war")
+            .expectedJdkVersion("JDK|21.0.9|65")
+            .targetJdkVersion(Opcodes.V21)
+            .waitStrategy(Wait.forLogMessage(".*JMXService.*", 1))
+            .build();
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG);
+
+    @Override
+    protected ProbeTestConfig getConfig() {
+        return CONFIG;
+    }
+
+    @Override
+    protected GenericContainer<?> getContainer() {
+        return container;
+    }
+}

integration-test/src/test/java/com/reajason/javaweb/integration/probe/payara/Payara7202606ContainerTest.java

@@ -0,0 +1,38 @@
+package com.reajason.javaweb.integration.probe.payara;
+
+import com.reajason.javaweb.integration.probe.AbstractProbeContainerTest;
+import com.reajason.javaweb.integration.probe.ProbeTestConfig;
+import net.bytebuddy.jar.asm.Opcodes;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/12
+ */
+@Testcontainers
+public class Payara7202606ContainerTest extends AbstractProbeContainerTest {
+
+    private static final ProbeTestConfig CONFIG = ProbeTestConfig.payaraJakarta(
+                    "payara/server-web:7.2026.6",
+                    "/opt/payara/deployments/app.war")
+            .expectedJdkVersion("JDK|21.0.11|65")
+            .targetJdkVersion(Opcodes.V21)
+            .waitStrategy(Wait.forHttp("/app/").forPort(8080).forStatusCode(200))
+            .build();
+
+    @Container
+    public static final GenericContainer<?> container = buildContainer(CONFIG);
+
+    @Override
+    protected ProbeTestConfig getConfig() {
+        return CONFIG;
+    }
+
+    @Override
+    protected GenericContainer<?> getContainer() {
+        return container;
+    }
+}