Default AS_HOSTNAME can be set from the outside explicitly

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

Author: dmatej

.github/workflows/build-linux.yml

@@ -19,8 +19,18 @@ jobs:
       with:
         java-version: '21'
         distribution: 'temurin'
-    - name: List ports
-      run: ss -tulpn
+    - name: Print OS Info
+      run: |
+        set -x
+        hostname
+        env | sort
+        cat /etc/hosts
+        ifconfig
+        netstat -rn
+        cat /etc/resolv.conf
+        resolvectl status
+        ss -tulpn
+        cat /proc/cpuinfo
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI

.github/workflows/build-macos.yml

@@ -19,12 +19,27 @@ jobs:
       with:
         java-version: '21'
         distribution: 'temurin'
+    - name: Print OS Info
+      run: |
+        set -x
+        hostname
+        env | sort
+        ifconfig
+        scutil --dns
+        scutil --nwi
+        netstat -rn
+        sysctl -n machdep.cpu.brand_string
+        sysctl -n hw.physicalcpu
+        sysctl -n hw.logicalcpu
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI
+      # We explicitly run tests sensitive to the OS
       run: mvn -B -e -ntp install -Pqa,snapshots '-Dcheckstyle.skip=true' -Pfastest
-    - name: Test GF Starts
-      run: mvn -B -e -ntp install -Psnapshots '-Dcheckstyle.skip=true' -pl :glassfish-itest-tools
+    - name: Run Selected Tests
+      run: |
+        mvn -B -e -ntp clean install -Psnapshots '-Dcheckstyle.skip=true' -pl :common-util
+        mvn -B -e -ntp clean install -Psnapshots '-Dcheckstyle.skip=true' -pl :glassfish-itest-tools
     - name: Upload server logs
       uses: actions/upload-artifact@v4
       if: failure()

.github/workflows/build-windows.yml

@@ -19,6 +19,15 @@ jobs:
       with:
         java-version: '21'
         distribution: 'temurin'
+    - name: Print OS Info
+      shell: pwsh
+      run: |
+        ls env: | sort Name
+        cat C:\Windows\System32\drivers\etc\hosts
+        Get-NetIPConfiguration -Detailed
+        Get-DnsClientServerAddress
+        ipconfig /all
+        Get-CimInstance Win32_Processor | Format-List *
     - name: Build with Maven
       # qa skips documentation - we check it on Jenkins CI
       # We skip checkstyle too - we check it on Jenkins CI

nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/Config.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022, 2026 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -20,7 +20,6 @@
 import com.sun.common.util.logging.LoggingConfigImpl;
 import com.sun.enterprise.config.serverbeans.customvalidators.NotDuplicateTargetName;
 import com.sun.enterprise.config.serverbeans.customvalidators.NotTargetKeyword;
-import com.sun.enterprise.config.util.ServerHelper;
 
 import jakarta.validation.Payload;
 import jakarta.validation.constraints.NotNull;
@@ -344,7 +343,23 @@ private LoggingConfigImpl getLoggingConfig() {
     }
 
     default NetworkListener getAdminListener() {
-        return ServerHelper.getAdminListener(this);
+        NetworkConfig networkConfig = getNetworkConfig();
+        if (networkConfig == null) {
+            throw new IllegalStateException("Can't operate without <http-service>");
+        }
+
+        List<NetworkListener> listeners = networkConfig.getNetworkListeners().getNetworkListener();
+        if (listeners == null || listeners.isEmpty()) {
+            throw new IllegalStateException("Can't operate without at least one <network-listener>");
+        }
+
+        for (NetworkListener listener : listeners) {
+            if (ServerTags.ADMIN_LISTENER_ID.equals(listener.getName())) {
+                return listener;
+            }
+        }
+        // if we can't find the admin-listener, then use the first one
+        return listeners.get(0);
     }
 
     /**

nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/ServerHelper.java

@@ -22,19 +22,15 @@
 import com.sun.enterprise.config.serverbeans.Node;
 import com.sun.enterprise.config.serverbeans.Nodes;
 import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.config.serverbeans.ServerTags;
 import com.sun.enterprise.config.serverbeans.SystemProperty;
 import com.sun.enterprise.util.StringUtils;
 import com.sun.enterprise.util.net.NetUtils;
 
-import java.net.InetAddress;
-import java.util.List;
 import java.util.Objects;
 
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.config.support.GlassFishConfigBean;
 import org.glassfish.config.support.PropertyResolver;
-import org.glassfish.grizzly.config.dom.NetworkConfig;
 import org.glassfish.grizzly.config.dom.NetworkListener;
 import org.jvnet.hk2.config.Dom;
 
@@ -82,7 +78,7 @@ public final Integer getAdminPort() {
      */
     public final String getAdminHost() throws RuntimeException {
         // Look at the address for the admin-listener first
-        String addr = translateAddressAndPort(getAdminListener(config), server, config)[0];
+        String addr = translateAddressAndPort(config.getAdminListener(), server, config)[0];
         if (addr != null && !addr.equals("0.0.0.0")) {
             return addr;
         }
@@ -109,10 +105,9 @@ public final String getAdminHost() throws RuntimeException {
             if (node != null) {
                 hostName = node.getNodeHost();
             }
-            // XXX Hack to get around the fact that the default localhost
-            // node entry is malformed
+            // Hack to get around the fact that the default localhost node entry is malformed
             if (hostName == null && nodeName.equals("localhost-" + domain.getName())) {
-                return InetAddress.getLoopbackAddress().getHostName();
+                return NetUtils.getHostName();
             }
         }
 
@@ -131,25 +126,6 @@ public final boolean isListeningOnAdminPort() {
         }
     }
 
-    public static NetworkListener getAdminListener(Config config) {
-        NetworkConfig networkConfig = config.getNetworkConfig();
-        if (networkConfig == null) {
-            throw new IllegalStateException("Can't operate without <http-service>");
-        }
-
-        List<NetworkListener> listeners = networkConfig.getNetworkListeners().getNetworkListener();
-        if (listeners == null || listeners.isEmpty()) {
-            throw new IllegalStateException("Can't operate without at least one <network-listener>");
-        }
-
-        for (NetworkListener listener : listeners) {
-            if (ServerTags.ADMIN_LISTENER_ID.equals(listener.getName())) {
-                return listener;
-            }
-        }
-        // if we can't find the admin-listener, then use the first one
-        return listeners.get(0);
-    }
 
     ///////////////////////////////////////////
     ///////////////////  all private below
@@ -159,7 +135,7 @@ private static String getAdminPortString(Server server, Config config) {
         if (server == null || config == null) {
             return null;
         }
-        return translateAddressAndPort(getAdminListener(config), server, config)[1];
+        return translateAddressAndPort(config.getAdminListener(), server, config)[1];
     }
 
     /**

nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/ASenvPropertyReader.java

@@ -24,7 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
+import org.glassfish.embeddable.GlassFishVariable;
 import org.glassfish.main.jdke.props.EnvToPropsConverter;
 
 import static org.glassfish.embeddable.GlassFishVariable.CONFIG_ROOT;
@@ -50,6 +52,7 @@
  */
 public class ASenvPropertyReader {
 
+    /** Mapping of env properties to system properties - just for {@link File} values */
     private static final Map<String, String> ENV_TO_SYS_PROPERTY = Map.of(
         DERBY_ROOT.getEnvName(), DERBY_ROOT.getSystemPropertyName(),
         IMQ_LIB.getEnvName(), IMQ_LIB.getSystemPropertyName(),
@@ -123,17 +126,31 @@ public String toString() {
         return sb.toString();
     }
 
-
+    /**
+     * Keys: {@link GlassFishVariable#getPropertyName()}
+     */
     static class ASenvMap extends HashMap<String, String> {
 
+        private static final long serialVersionUID = 7637813272148581948L;
+
         ASenvMap(File installDir) {
-            new EnvToPropsConverter(installDir.toPath()).convert(ENV_TO_SYS_PROPERTY).entrySet()
+            EnvToPropsConverter converter = new EnvToPropsConverter(installDir.toPath());
+            converter.convert(ENV_TO_SYS_PROPERTY).entrySet()
                 .forEach(e -> this.put(e.getKey(), e.getValue().getPath()));
-            String javaHome = new File(System.getProperty(JAVA_HOME.getSystemPropertyName())).toPath().toString();
-            putIfAbsent(JAVA_ROOT.getPropertyName(), javaHome);
-            putIfAbsent(HOST_NAME.getPropertyName(), NetUtils.getCanonicalHostName());
-            putIfAbsent(INSTALL_ROOT.getPropertyName(), installDir.toPath().toString());
-            putIfAbsent(PRODUCT_ROOT.getPropertyName(), installDir.getParentFile().toPath().toString());
+            evaluate(converter, HOST_NAME, NetUtils::getCanonicalHostName);
+            // Now defaults
+            computeIfAbsent(JAVA_ROOT, () -> new File(System.getProperty(JAVA_HOME.getSystemPropertyName())));
+            computeIfAbsent(INSTALL_ROOT, () -> installDir);
+            computeIfAbsent(PRODUCT_ROOT, () -> installDir.getParentFile());
+        }
+
+        private void computeIfAbsent(GlassFishVariable variable, Supplier<File> defaultValue) {
+            computeIfAbsent(variable.getPropertyName(), k -> defaultValue.get().toPath().toString());
+        }
+
+        private void evaluate(EnvToPropsConverter converter, GlassFishVariable variable, Supplier<String> defaultValue) {
+            String value = converter.evaluate(variable.getEnvName(), variable.getSystemPropertyName());
+            put(variable.getPropertyName(), value == null ? defaultValue.get() : value);
         }
     }
 }

nucleus/common/common-util/src/main/java/com/sun/enterprise/util/net/NetUtils.java

@@ -34,6 +34,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.glassfish.embeddable.GlassFishVariable;
+
 import static java.lang.System.Logger.Level.TRACE;
 import static java.lang.System.Logger.Level.WARNING;
 
@@ -387,6 +389,10 @@ public static String getHostName() {
      */
     public static String getCanonicalHostName() {
         // short-circuit out if user has reverse-DNS issues
+        String envValue = System.getenv(GlassFishVariable.HOST_NAME.getEnvName());
+        if (envValue != null) {
+            return envValue;
+        }
         if (Boolean.parseBoolean(System.getenv("AS_NO_REVERSE_DNS"))) {
             return getHostName();
         }

nucleus/common/glassfish-jdk-extensions/src/main/java/org/glassfish/main/jdke/props/EnvToPropsConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2024, 2026 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
@@ -90,7 +90,17 @@ public File convert(final String envPropertyName, final String systemPropertyNam
     }
 
 
-    private String evaluate(final String envPropertyName, final String systemPropertyName) {
+    /**
+     * <ul>
+     * <li>First tries {@link System#getProperty(String)} using the second parameter.
+     * <li>Then tries {@link System#getenv(String)} using the first parameter.
+     * </ul>
+     *
+     * @param envPropertyName
+     * @param systemPropertyName
+     * @return value or null if neither system property nor environment variable is set.
+     */
+    public String evaluate(final String envPropertyName, final String systemPropertyName) {
         if (systemPropertyName != null) {
             final String sysValue = System.getProperty(systemPropertyName);
             if (sysValue != null) {

nucleus/common/simple-glassfish-api/src/main/java/org/glassfish/embeddable/GlassFishVariable.java

@@ -31,7 +31,7 @@ public enum GlassFishVariable {
     /** Directory where we have domains */
     DOMAINS_ROOT("AS_DEF_DOMAINS_PATH", "com.sun.aas.domainsRoot"),
     /** Autodetected host name. */
-    HOST_NAME(null, "com.sun.aas.hostName"),
+    HOST_NAME("AS_HOSTNAME", "com.sun.aas.hostName"),
     /** Java home directory set by JVM automatically via <code>java.home</code> or via JAVA_HOME by user. */
     JAVA_HOME("JAVA_HOME", "java.home"),
     /** Java home set by AS_JAVA, has higher priority than JAVA_HOME. */

nucleus/distributions/nucleus-common/src/main/resources/config/asenv.bat

@@ -43,6 +43,7 @@ IF "%AS_DERBY_INSTALL%"=="" SET "AS_DERBY_INSTALL=%AS_INSTALL%\..\javadb"
 IF "%AS_IMQ_BIN%"=="" SET "AS_IMQ_BIN=%AS_INSTALL%\..\mq\bin"
 IF "%AS_IMQ_LIB%"=="" SET "AS_IMQ_LIB=%AS_INSTALL%\..\mq\lib"
 
+IF "%AS_HOSTNAME%"=="" IF NOT "%COMPUTERNAME%"=="" SET AS_HOSTNAME=%COMPUTERNAME%
 IF "%AS_CONFIG%"=="" SET "AS_CONFIG=%AS_INSTALL%\config"
 IF "%AS_DEF_DOMAINS_PATH%"=="" SET "AS_DEF_DOMAINS_PATH=%AS_INSTALL%\domains"
 IF "%AS_DEF_NODES_PATH%"=="" SET "AS_DEF_NODES_PATH=%AS_INSTALL%\nodes"