Simple system properties in glassfish.properties for runneble Embedded GlassFish

Author: OndroMih

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,8 +80,9 @@ class AutoDisposableGlassFish extends GlassFishImpl {
                         && resultList.getOutput().contains(propertyPrefix)) {
                     knownPropertyPrefixes.add(propertyPrefix);
                 } else {
-                    // unknown property prefix, skip it
-                    continue;
+                    // 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);
                 }
             }
             CommandResult result = commandRunner.run("set", propertyName + "=" + propertyValue);

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);