Simple system properties in glassfish.properties for runneble Embedded GlassFish

Author: OndroMih

appserver/tests/embedded/runnable/src/test/java/org/glassfish/tests/embedded/runnable/SystemPropertyTest.java

@@ -85,6 +85,26 @@ void testSystemPropertyFromAdminCommand(String gfEmbeddedJarName) throws Excepti
         }
     }
 
+    @ParameterizedTest
+    @ArgumentsSource(GfEmbeddedJarNameProvider.class)
+    void testSystemPropertyFromPropertyFileDirectly(String gfEmbeddedJarName, TestInfo testInfo) throws Exception {
+        File warFile = null;
+        Path propertiesFile = preparePropertiesFile(testInfo);
+        try {
+            warFile = createSystemPropertyApp();
+            Process gfEmbeddedProcess = runGlassFishEmbedded(gfEmbeddedJarName,
+                    "--properties=" + propertiesFile.toFile().getPath(),
+                    warFile.getAbsolutePath()
+            );
+            assertTrue(outputToStreamOfLines(gfEmbeddedProcess)
+                    .anyMatch(line -> line.contains("System property my.name: Embedded GlassFish")),
+                    "Application should print the value of the my.name system property.");
+            gfEmbeddedProcess.waitFor(30, TimeUnit.SECONDS);
+        } finally {
+            Optional.ofNullable(warFile).ifPresent(File::delete);
+        }
+    }
+
     @ParameterizedTest
     @ArgumentsSource(GfEmbeddedJarNameProvider.class)
     void testSystemPropertyFromDomainConfig(String gfEmbeddedJarName, TestInfo testInfo) throws Exception {
@@ -125,4 +145,14 @@ private Path prepareDomainConfig(TestInfo testInfo) throws IOException {
         return domainConfigFile;
     }
 
+    private Path preparePropertiesFile(TestInfo testInfo) throws IOException {
+        String testClassName = testInfo.getTestClass().get().getSimpleName();
+        String testMethodName = testInfo.getTestMethod().get().getName();
+        Path propertiesFile = Paths.get(testClassName + "-" + testMethodName + "-" + "glassfish.properties");
+        Files.copy(getClass().getClassLoader().getResourceAsStream(testClassName + "/glassfish.properties"),
+                propertiesFile,
+                StandardCopyOption.REPLACE_EXISTING);
+        return propertiesFile;
+    }
+
 }

appserver/tests/embedded/runnable/src/test/resources/SystemPropertyTest/glassfish.properties

@@ -0,0 +1,15 @@
+# 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
+
+my.name=Embedded GlassFish

docs/embedded-server-guide/src/main/asciidoc/embedded-server-guide.adoc

@@ -285,6 +285,9 @@ The value will be treated as a command to execute at startup.
     - Keys that start with the "deploy." prefix, followed by any text. The
 value will be treated as an application to deploy at startup, as if it
 was specified on the command line.
+    - If a property name doesn't match any already supported patterns and is not
+a recognized GlassFish property, it will be set as a system property, if
+it's not already defined.
 For example, the ${productName} domain directory can be specified with the
 usual Embedded ${productName} property
 "glassfish.embedded.tmpdir=myDomainDir", as well as with the property

nucleus/core/bootstrap-osgi/src/main/java/org/glassfish/main/boot/embedded/AutoDisposableGlassFish.java

@@ -37,6 +37,7 @@
 import org.glassfish.embeddable.GlassFishProperties;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.main.boot.impl.GlassFishImpl;
+import org.glassfish.main.jdke.props.SystemProperties;
 
 import static com.sun.enterprise.glassfish.bootstrap.cfg.BootstrapKeys.AUTO_DELETE;
 
@@ -79,7 +80,12 @@ class AutoDisposableGlassFish extends GlassFishImpl {
                         && resultList.getOutput().contains(propertyPrefix)) {
                     knownPropertyPrefixes.add(propertyPrefix);
                 } else {
-                    // unknown property prefix, skip it
+                    if (!key.startsWith("com.sun.aas.") && !key.startsWith("-")) {
+                        // unknown property, set as system property
+                        LOG.log(Level.INFO, "Setting system property " + key + " from GlassFish properties, it doesn't match any known property");
+                        SystemProperties.setProperty(key, gfProps.getProperty(key), false);
+                    }
+                    // not a dotted name, doesn't start with a supported prefix, do not set it later
                     continue;
                 }
             }

nucleus/core/kernel/src/main/java/org/glassfish/runnablejar/commandline/Option.java

@@ -51,7 +51,9 @@ public enum Option {
             + " - Keys that start with the \"" + Arguments.DEPLOY_KEY_PREFIX
             + "\" prefix, followed by any text. The value will be"
             + " treated as an application to deploy at startup, as if it was specified on the command line.\n"
-            + "For example, the GlassFish domain directory can be specified with the usual GlassFish Embedded"
+            + " - If a property name doesn't match any already supported patterns and is not"
+            + " a recognized GlassFish property, it will be set as a system property, if it's not already defined.\n"
+            + "\nFor example, the GlassFish domain directory can be specified with the usual GlassFish Embedded"
             + " property \"glassfish.embedded.tmpdir=myDomainDir\", as well as with the property"
             + " \"domainDir=myDomainDir\" that represents the \"--domainDir=myDomainDir\" command-line option."
             + " A command to deploy an application can be specified via a property key"

nucleus/core/kernel/src/test/java/org/glassfish/runnablejar/commandline/WordWrapperTest.java

@@ -38,7 +38,7 @@ public void testWrapper() {
                                     .map(Option::getHelpText)
                                     .collect(wordWrapper);
         final List<String> linesEndingWithSpace = message.lines()
-                .filter(line -> line.endsWith(" "))
+                .filter(line -> line.endsWith(" ") && !line.isBlank())
                 .collect(toList());
         assertTrue(linesEndingWithSpace.isEmpty(), "Some lines end with a space: " + linesEndingWithSpace);