From 27a1bf14812bb7507f8f118cc1f9411804394f94 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Thu, 7 Nov 2024 11:05:16 +0100
Subject: [PATCH] bug6065: moved addition of branding arg from security to
 general

---
 .../SailingAnalyticsApplicationConfiguration.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java
index 582f44629d8..dd002edcbba 100755
--- a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java
+++ b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java
@@ -175,10 +175,14 @@ extends AwsApplicationConfiguration<ShardingKey, SailingAnalyticsMetrics, Sailin
          *         {@link DefaultProcessConfigurationVariables#ADDITIONAL_JAVA_ARGS ${ADDITIONAL_JAVA_ARGS}} variable.
          *         An example string in the resulting sequence could be {@code "-Da=b"}. This implementation returns the
          *         system properties required to configure security shared across the
-         *         {@link SharedLandscapeConstants#DEFAULT_DOMAIN_NAME} domain.
+         *         {@link SharedLandscapeConstants#DEFAULT_DOMAIN_NAME} domain, as well as the activation of SAP branding,
+         *         assuming that this runs under the {@link SharedLandscapeConstants#DEFAULT_DOMAIN_NAME default domain}.
          */
         protected Iterable<String> getAdditionalJavaArgs() {
-            return getAdditionalJavaArgsForSharedSecurity(SharedLandscapeConstants.DEFAULT_DOMAIN_NAME, SharedLandscapeConstants.DEFAULT_SECURITY_SERVICE_REPLICA_SET_NAME);
+            final List<String> result = new ArrayList<>();
+            Util.addAll(getAdditionalJavaArgsForSharedSecurity(SharedLandscapeConstants.DEFAULT_DOMAIN_NAME, SharedLandscapeConstants.DEFAULT_SECURITY_SERVICE_REPLICA_SET_NAME), result);
+            result.add("-D"+ClientConfigurationListener.DEBRANDING_PROPERTY_NAME+"=false"); // activate branding when running under default SAP domain
+            return result;
         }
 
         protected void addUserDataForPort(final Map<ProcessConfigurationVariable, String> result, ProcessConfigurationVariable variable, Integer port) {
@@ -201,7 +205,6 @@ extends AwsApplicationConfiguration<ShardingKey, SailingAnalyticsMetrics, Sailin
         protected Iterable<String> getAdditionalJavaArgsForSharedSecurity(final String defaultDomainName, final String defaultSecurityServiceReplicaSetName) {
             return Arrays.asList(
                     "-Dsecurity.sharedAcrossSubdomainsOf="+defaultDomainName,
-                    "-D"+ClientConfigurationListener.DEBRANDING_PROPERTY_NAME+"=false", // activate branding when running under default SAP domain
                     "-Dsecurity.baseUrlForCrossDomainStorage=https://"+getDefaultSecurityServiceReplicaSetHostname(defaultDomainName, defaultSecurityServiceReplicaSetName),
                     "-Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\\.)?"+(defaultDomainName.replaceAll("\\.", "\\\\."))+"(:[0-9]*)?$");
         }