Merge pull request #24836 from arjantijms/8.0

Merge latest changes from master into 8.0

appserver/admin/template/src/main/resources/config/domain.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation.
     Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -86,6 +86,7 @@
       </iiop-service>
       <admin-service auth-realm-name="admin-realm" type="das-and-server" system-jmx-connector-name="system">
         <jmx-connector auth-realm-name="admin-realm" security-enabled="false" address="0.0.0.0" port="%%%JMX_SYSTEM_CONNECTOR_PORT%%%" name="system" />
+        <property value="default" name="adminConsoleStartup" />
         <property value="/admin" name="adminConsoleContextRoot" />
         <property value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
         <property value="${com.sun.aas.installRoot}/.." name="ipsRoot" />

appserver/admingui/jdbc/src/main/resources/org/glassfish/jdbc/admingui/Strings.properties

@@ -107,7 +107,6 @@ jdbcPool.Guaranteed=Guaranteed
 jdbcPool.isoLevelHelp=All connections use same isolation level; requires Transaction Isolation
 
 
-jdbcPool.Guaranteed=Guaranteed
 jdbcPool.initSqlHelp=Specify a SQL string to be executed whenever a connection is created from the pool
 jdbcPool.initSql=Init SQL:
 jdbcPool.sqlTL=SQL Trace Listeners:

appserver/admingui/web/src/main/resources/org/glassfish/web/admingui/Strings.properties

@@ -48,11 +48,6 @@ tree.threadPools=Thread Pools
 tree.threadPools.tooltip=Thread Pools
 tree.configuration.httpListeners=Http Listeners
 
-tree.webContainer=Web Container
-tree.webContainer.tooltip=Web Container
-tree.httpService=HTTP Service
-tree.httpService.tooltip=HTTP Service
-
 button.Save=Save
 button.SaveAs=Save As...
 button.LoadDefaults=Load Defaults

appserver/appclient/server/core/src/main/resources/org/glassfish/appclient/server/core/jws/servedcontent/LocalStrings.properties

@@ -36,5 +36,4 @@ jws.appserver.information.description.one-line=Runtime libraries for running app
 jws.appserver.information.description.short=Runtime libraries for running application clients
 
 jws.information.title.prefix=Application Client
-jws.defaultVendorName=Application Client
 jws.extension.error=Error attempting to process extensions from the manifest of JAR file {0}; ignoring it and continuing

appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/codegen/LocalStrings.properties

@@ -32,10 +32,6 @@ generator.gen_wrapper_code=Generating wrapper code for {0}
 generator.compiling_wrapper=Compiling wrapper code ...
 generator.compiling_rmi_iiop=Compiling RMI-IIOP code ...
 generator.nothing_to_compile=No code generation required...
-generator.compiling_wrapper=Compiling wrapper code ...
-generator.compiling_rmi_iiop=Compiling RMI-IIOP code ...
-generator.compile=Compiling {0} ....
-generator.processing_beans=Processing beans ...
 java_compiler.unknown_exception=Native java compiler threw an Exception
 process.unknown_exception=Abnormal process termination -- process threw an Exception.\nAttempted command: {0}\nOutput from command: {1}
 process.abnormal_termination=Abnormal process termination -- process returned: {0}\nAttempted command: {1}\nOutput from command: {2}

appserver/load-balancer/admin/src/main/java/org/glassfish/loadbalancer/admin/cli/LocalStrings.properties

@@ -96,7 +96,6 @@ FailedToRemoveHC=Failed to remove health-checker.
 ServerNeedsToBeDisabled=Server [{0}] needs to be disabled before it can be removed from the load balancer.
 AppsRefNotDefined=Application refs element does not exist in server [{0}]. It can not be used as target in load balancer command.
 AppsNotDisabled=All referenced applications must be disabled in LB.
-ServerNeedsToBeDisabled=Server [{0}] needs to be disabled before it can be removed from the load balancer.
 FailedToRemoveServerRef=Failed to remove server-ref.
 FailedToRemoveClusterRef=Failed to remove cluster-ref.
 

appserver/pom.xml

@@ -137,7 +137,7 @@
         <wasp.version>4.0.0-M1</wasp.version>
 
         <!-- Used for Jakarta SOAP (XML Web Services) -->
-        <xmlsec.version>4.0.1</xmlsec.version>
+        <xmlsec.version>4.0.2</xmlsec.version>
         <woodstox.version>6.6.0</woodstox.version>
         <stax2-api.version>4.2.2</stax2-api.version>
 
@@ -468,7 +468,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.16.0</version>
+                <version>1.16.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>

appserver/tests/application/src/test/java/org/glassfish/main/test/app/security/jmac/http/servlet/basic/HttpServletBasicAuthTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -67,9 +68,10 @@ public class HttpServletBasicAuthTest {
     @BeforeAll
     public static void prepareDeployment() {
         keyFile = getDomain1Directory().resolve(Path.of("config", "keyfile123.txt")).toFile();
-        assertThat(ASADMIN.exec("create-auth-realm", "--classname",
-            "com.sun.enterprise.security.auth.realm.file.FileRealm", "--property",
-            "file=" + keyFile.getAbsolutePath() + ":jaas-context=fileRealm", "--target", "server", FILE_REALM_NAME),
+        assertThat(ASADMIN.exec("create-auth-realm",
+            "--classname", "com.sun.enterprise.security.auth.realm.file.FileRealm",
+            "--property", "file=" + keyFile.getAbsolutePath().replaceAll("([\\\\:])", "\\\\$1") + ":jaas-context=fileRealm",
+            "--target", "server", FILE_REALM_NAME),
             asadminOK());
         createFileUser(FILE_REALM_NAME, USER_NAME, USER_PASSWORD, "mygroup");
 

appserver/tests/application/src/test/java/org/glassfish/main/test/app/security/jmac/http/servlet/challenge/HttpServletChallengeAuthTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -72,9 +73,10 @@ public class HttpServletChallengeAuthTest {
     @BeforeAll
     public static void prepareDeployment() {
         keyFile = getDomain1Directory().resolve(Path.of("config", "file123.txt")).toFile();
-        assertThat(ASADMIN.exec("create-auth-realm", "--classname",
-            "com.sun.enterprise.security.auth.realm.file.FileRealm", "--property",
-            "file=" + keyFile.getAbsolutePath() + ":jaas-context=fileRealm", "--target", "server", FILE_REALM_NAME),
+        assertThat(ASADMIN.exec("create-auth-realm",
+            "--classname", "com.sun.enterprise.security.auth.realm.file.FileRealm",
+            "--property", "file=" + keyFile.getAbsolutePath().replaceAll("([\\\\:])", "\\\\$1") + ":jaas-context=fileRealm",
+            "--target", "server", FILE_REALM_NAME),
             asadminOK());
         createFileUser(FILE_REALM_NAME, USER_NAME, USER_PASSWORD, "mygroup");
         createFileUser(FILE_REALM_NAME, USER_NAME2, USER_PASSWORD2, "mygroup");

appserver/tests/application/src/test/java/org/glassfish/main/test/app/security/jmac/http/soap/embedded/HttpSoapEmbeddedAuthTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -76,9 +77,10 @@ public class HttpSoapEmbeddedAuthTest {
     @BeforeAll
     public static void prepareDeployment() {
         keyFile = getDomain1Directory().resolve(Path.of("config", "file123.txt")).toFile();
-        assertThat(ASADMIN.exec("create-auth-realm", "--classname",
-            "com.sun.enterprise.security.auth.realm.file.FileRealm", "--property",
-            "file=" + keyFile.getAbsolutePath() + ":jaas-context=fileRealm", "--target", "server", FILE_REALM_NAME),
+        assertThat(ASADMIN.exec("create-auth-realm",
+            "--classname", "com.sun.enterprise.security.auth.realm.file.FileRealm",
+            "--property", "file=" + keyFile.getAbsolutePath().replaceAll("([\\\\:])", "\\\\$1") + ":jaas-context=fileRealm",
+            "--target", "server", FILE_REALM_NAME),
             asadminOK());
         createFileUser(FILE_REALM_NAME, USER_NAME, USER_PASSWORD, "mygroup");
         createFileUser(FILE_REALM_NAME, USER_NAME2, USER_PASSWORD2, "mygroup");

appserver/tests/application/src/test/java/org/glassfish/main/test/app/security/multirolemapping/MultiRoleMappingTest.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 2023 Eclipse Foundation and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -231,7 +232,7 @@ private void check200(String relativePath, String user) throws IOException {
         try {
             assertThat(connection.getResponseCode(), equalTo(200));
             final String text = readResponseBody(connection);
-            assertThat(text, equalTo("Hello " + relativePath + "\n"));
+            assertThat(text, equalTo("Hello " + relativePath + System.lineSeparator()));
         } finally {
             connection.disconnect();
         }

appserver/transaction/jts/src/main/resources/com/sun/jts/CosTransactions/LocalStrings.properties

@@ -26,7 +26,6 @@ jts.log_write_failed=Failed to write log.
 jts.log_open_failed=Failed to open log {0}.
 jts.log_close_failed=Failed to close log.
 jts.log_file_seek_failed=Failed in file seek.
-jts.log_file_sync_failed=Failed in file sync.
 jts.log_create_LogFileHandle_failed=Failed to create LogFileHandle with ControlFile {0}.
 jts.log_create_LogHandle_failed=Failed to create LogHandle with logName {0}.
 jts.log_cushion_file_failed=Failed to create/check the cushion file.