bug6065: switched default for debranding from false to true;

landscape automation procedures under the default domain of
sapsailing.com will still keep branding active

java/com.sap.sailing.landscape/META-INF/MANIFEST.MF

@@ -32,6 +32,7 @@ Export-Package: com.sap.sailing.landscape,
  com.sap.sailing.landscape.procedures
 Bundle-ActivationPolicy: lazy
 Import-Package: com.sap.sailing.server.security,
+ com.sap.sse.debranding,
  org.osgi.framework,
  org.osgi.util.tracker;version="1.5.2"
 Bundle-Activator: com.sap.sailing.landscape.impl.Activator

java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java

@@ -12,6 +12,7 @@ import com.sap.sailing.landscape.SailingAnalyticsProcess;
 import com.sap.sailing.landscape.SailingReleaseRepository;
 import com.sap.sailing.landscape.common.SharedLandscapeConstants;
 import com.sap.sse.common.Util;
+import com.sap.sse.debranding.ClientConfigurationListener;
 import com.sap.sse.landscape.DefaultProcessConfigurationVariables;
 import com.sap.sse.landscape.ProcessConfigurationVariable;
 import com.sap.sse.landscape.Release;
@@ -200,6 +201,7 @@ 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]*)?$");
         }

java/com.sap.sailing.www/release_notes_admin.html

@@ -23,6 +23,15 @@
             <div class="mainContent">
                 <h2 class="releaseHeadline">Release Notes - Administration Console</h2>
                 <div class="innerContent">
+          <h2 class="articleSubheadline">November 2024</h2>
+          <ul class="bulletList">
+                <li>The system property for removing the SAP branding from the solution has changed its default. It used
+                    to default to <tt>false</tt>, meaning that by default the entire solution shows SAP's branding.
+                    Prior to publishing the repository under an open-source license we'd like to make clear that only
+                    SAP-reviewed versions such as from <a href="https://github.com/SAP/sailing-analytics">https://github.com/SAP/sailing-analytics</a>
+                    are supposed to show this branding. Any other fork must not, and the regular rules for the use of
+                    the SAP trademark apply. Therefore, we change the default value of this property to <tt>true</tt>.</li>
+          </ul>
           <h2 class="articleSubheadline">September 2024</h2>
           <ul class="bulletList">
             <li>When removing the denotation for smartphone tracking from a race, tracking of that race will

java/com.sap.sse.debranding/src/com/sap/sse/debranding/ClientConfigurationListener.java

@@ -61,7 +61,7 @@ public class ClientConfigurationListener implements javax.servlet.ServletRequest
                 final ServletContext ctx = sre.getServletContext();
                 final String ctxDebrandingActive = (String) ctx
                         .getAttribute("clientConfigurationContext.debrandingActive");
-                final boolean deBrandingActive = Boolean.valueOf(System.getProperty(DEBRANDING_PROPERTY_NAME, "false"));
+                final boolean deBrandingActive = Boolean.valueOf(System.getProperty(DEBRANDING_PROPERTY_NAME, "true"));
                 if (ctxDebrandingActive == null
                         || !Boolean.toString(deBrandingActive).equalsIgnoreCase(ctxDebrandingActive)) {
                     createReplacementMap(deBrandingActive).forEach((k, v) -> {