Test for Embedded GlassFish

Author: OndroMih

images/server/7.1.0/docs/content.md

@@ -49,10 +49,10 @@ Follow these steps:
 
 1. Create an empty directory on your filesystem, e.g. `/deployment`
 2. Copy the application package to this directory - so that it's for example on the path `/deployment/application.war`
-3. Run the following command to start GlassFish in Docker with your application, where `/deployments` is path to the directory created in step 1:
+3. Run the following command to start GlassFish in Docker with your application, where `/deployments` is path to the directory created in step 1, and /deploy is the directory in the container where GlassFish expects applications:
 
 ```
-docker run -p 8080:8080 -p 4848:4848 -v /deployments:/opt/glassfish7/glassfish/domains/domain1/autodeploy @docker.glassfish.repository@
+docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@
 ```
 
 Then you can open the application in the browser with:

pom.xml

@@ -319,6 +319,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+                <executions>
+                    <execution>
+                        <id>build-test-app</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                        <configuration>
+                            <warSourceDirectory>src/test/webapp</warSourceDirectory>
+                            <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                            <warName>application</warName>
+                            <classifier>test</classifier>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
@@ -346,6 +365,7 @@
                     <configuration>
                         <systemPropertyVariables>
                             <server.docker.glassfish.image>${server.docker.glassfish.image}</server.docker.glassfish.image>
+                            <embedded.docker.glassfish.image>${embedded.docker.glassfish.image}</embedded.docker.glassfish.image>
                         </systemPropertyVariables>
                         <includes>
                             <include>**/*IT.java</include>

src/main/resources/images/embedded/docs/content.md

@@ -56,6 +56,14 @@ Follow these steps:
 docker run -p 8080:8080 -v /deployments:/deploy @docker.glassfish.embedded.repository@
 ```
 
+Alternatively, you can mount a specific WAR file directly:
+
+```
+docker run -p 8080:8080 -v /deployments/application.war:/deploy/application.war @docker.glassfish.embedded.repository@
+```
+
+**Note**: When deploying a single application, GlassFish Embedded automatically deploys it at the root context (`/`) rather than using the WAR filename as the context path.
+
 Then you can open the application in the browser with:
 
 * http://localhost:8080
@@ -98,12 +106,20 @@ docker run -p 8080:8080 -e 'JAVA_TOOL_OPTIONS=-Xmx512m -Dmy.property=value' @doc
 
 ### Custom application deployment
 
-Applications placed in the `/deploy` directory will be automatically deployed at startup:
+Applications placed in the `/deploy` directory will be automatically deployed at startup. You can either:
 
+- Mount a directory containing WAR files:
 ```
 docker run -p 8080:8080 -v /path/to/apps:/deploy @docker.glassfish.embedded.repository@
 ```
 
+- Mount a specific WAR file directly:
+```
+docker run -p 8080:8080 -v /path/to/myapp.war:/deploy/myapp.war @docker.glassfish.embedded.repository@
+```
+
+**Note**: When deploying a single application, GlassFish Embedded automatically deploys it at the root context (`/`) rather than using the WAR filename as the context path.
+
 Paths to applications in different locations can be passed on command line, e.g.:
 
 ```

src/main/resources/images/server/docs/content.md

@@ -55,6 +55,14 @@ Follow these steps:
 docker run -p 8080:8080 -p 4848:4848 -v /deployments:/deploy @docker.glassfish.repository@
 ```
 
+Alternatively, you can mount a specific WAR file directly:
+
+```
+docker run -p 8080:8080 -p 4848:4848 -v /deployment/application.war:/deploy/application.war @docker.glassfish.repository@
+```
+
+**Note**: GlassFish Server deploys applications using the WAR filename as the context path (e.g., `application.war` becomes accessible at `/application/`).
+
 Then you can open the application in the browser with:
 
 * http://localhost:9080/application

src/test/java/org/glassfish/main/distributions/docker/embedded/EmbeddedDeploymentIT.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package org.glassfish.main.distributions.docker.embedded;
+
+import java.net.http.HttpResponse;
+import java.time.Duration;
+
+import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.BindMode;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getEmbeddedApplication;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Testcontainers
+public class EmbeddedDeploymentIT {
+
+    @SuppressWarnings({"rawtypes", "resource"})
+    @Container
+    private final GenericContainer server = new GenericContainer<>(System.getProperty("embedded.docker.glassfish.image"))
+        .withExposedPorts(8080)
+        .withFileSystemBind("target/test-classes/application-test.war", "/deploy/application.war", BindMode.READ_ONLY)
+        .waitingFor(Wait.forListeningPort().withStartupTimeout(Duration.ofMinutes(2)))
+        .withLogConsumer(o -> System.err.print("GF-Embedded: " + o.getUtf8String()));
+
+    @Test
+    void deployedApplicationIsAccessible() throws Exception {
+        // Wait for the GLASSFISH STARTED message in logs
+        long startTime = System.currentTimeMillis();
+        boolean glassfishStarted = false;
+        while (!glassfishStarted && (System.currentTimeMillis() - startTime) < 120000) { // 2 minutes
+            String logs = server.getLogs();
+            if (logs.contains("GLASSFISH STARTED")) {
+                glassfishStarted = true;
+            } else {
+                Thread.sleep(1000); // Wait 1 second before checking again
+            }
+        }
+
+        if (!glassfishStarted) {
+            System.err.println("Full logs: " + server.getLogs());
+            throw new RuntimeException("GlassFish did not start within 2 minutes");
+        }
+
+        System.err.println("GlassFish started successfully, checking application deployment...");
+
+        // Verify the application is deployed by checking if it's accessible
+        final HttpResponse<String> appResponse = getEmbeddedApplication(server, "/index.html");
+        System.err.println("Response status: " + appResponse.statusCode());
+        System.err.println("Response body: " + appResponse.body());
+        assertEquals(200, appResponse.statusCode(), "Application response status code");
+        assertTrue(appResponse.body().contains("Hello from test app"), "Application should return Hello message");
+    }
+}

src/test/java/org/glassfish/main/distributions/docker/server/AsadminIT.java

@@ -25,7 +25,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot;
 
 /**
  *

src/test/java/org/glassfish/main/distributions/docker/server/ChangePasswordsIT.java

@@ -22,11 +22,11 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.glassfish.main.distributions.docker.server.HttpUtilities.getAdminResource;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getAdminResource;
 
 /**
  *

src/test/java/org/glassfish/main/distributions/docker/server/DefaultIT.java

@@ -23,7 +23,7 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;

src/test/java/org/glassfish/main/distributions/docker/server/StartServIT.java

@@ -23,7 +23,7 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import static org.glassfish.main.distributions.docker.server.HttpUtilities.getServerDefaultRoot;
+import static org.glassfish.main.distributions.docker.testutils.HttpUtilities.getServerDefaultRoot;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;

…butions/docker/server/HttpUtilities.java …ions/docker/testutils/HttpUtilities.javasrc/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java renamed to src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java src/test/java/org/glassfish/main/distributions/docker/server/HttpUtilities.java renamed to src/test/java/org/glassfish/main/distributions/docker/testutils/HttpUtilities.java

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package org.glassfish.main.distributions.docker.server;
+package org.glassfish.main.distributions.docker.testutils;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -29,6 +29,7 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import org.glassfish.main.distributions.docker.server.UserPassword;
 import org.testcontainers.containers.GenericContainer;
 
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
@@ -42,23 +43,31 @@ public final class HttpUtilities {
     private HttpUtilities() {
     }
 
-    static HttpResponse<String> getServerDefaultRoot(GenericContainer server) throws Exception {
+    public static HttpResponse<String> getServerDefaultRoot(GenericContainer server) throws Exception {
         URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + "/");
         try (HttpClient client = newInsecureHttpClient()) {
             final HttpRequest request = HttpRequest.newBuilder(uri).build();
             return client.send(request, ofString(StandardCharsets.UTF_8));
         }
     }
 
-    static HttpResponse<String> getEmbeddedDefaultRoot(GenericContainer server) throws Exception {
+    public static HttpResponse<String> getEmbeddedDefaultRoot(GenericContainer server) throws Exception {
         URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + "/");
         try (HttpClient client = newInsecureHttpClient()) {
             final HttpRequest request = HttpRequest.newBuilder(uri).build();
             return client.send(request, ofString(StandardCharsets.UTF_8));
         }
     }
 
-    static HttpResponse<String> getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception {
+    public static HttpResponse<String> getEmbeddedApplication(GenericContainer server, String appPath) throws Exception {
+        URI uri = URI.create("http://localhost:" + server.getMappedPort(8080) + appPath);
+        try (HttpClient client = newInsecureHttpClient()) {
+            final HttpRequest request = HttpRequest.newBuilder(uri).build();
+            return client.send(request, ofString(StandardCharsets.UTF_8));
+        }
+    }
+
+    public static HttpResponse<String> getAdminResource(GenericContainer server, String resourcePath, UserPassword userPass) throws Exception {
         URI uri = URI.create("https://localhost:" + server.getMappedPort(4848) + resourcePath);
         try (HttpClient client = newInsecureHttpClient()) {
             final HttpRequest request = HttpRequest.newBuilder(uri)