Changes in cb108bc: bug6060: updated documentation and env.sh regarding the new com.sap.sse.branding system property

				configuration/environments/archive-server
			
          @@ -13,7 +13,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com

           REPLICATE_MASTER_SERVLET_PORT=443

           REPLICATE_MASTER_EXCHANGE_NAME=security_service

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

           # Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...

           #REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:&lt;server-name&gt; permission)

           #REPLICATE_MASTER_PASSWORD=(password of the user for replication login on security-service.sapsailing.com)

				configuration/environments/live-master-server
			
          @@ -8,7 +8,7 @@ REPLICATE_ON_START=com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sailing

           REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com

           REPLICATE_MASTER_EXCHANGE_NAME=security_service

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

           # Provide authentication credentials for a user on the security-service.sapsailing.com permitted to replicate, either by username/password...

           #REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:&lt;server-name&gt; permission)

           #REPLICATE_MASTER_PASSWORD=(password of the user for replication login on security-service.sapsailing.com)

				configuration/environments/live-replica-server
			
          @@ -1,4 +1,4 @@

           AUTO_REPLICATE=true

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sapsailing\.com(:[0-9]*)?$"

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

				configuration/environments/live-server
			
          @@ -19,7 +19,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com

           REPLICATE_MASTER_SERVLET_PORT=443

           REPLICATE_MASTER_EXCHANGE_NAME=security_service

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

           # Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...

           #REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:&lt;server-name&gt; permission)

				configuration/environments/master
			
          @@ -25,7 +25,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com

           REPLICATE_MASTER_SERVLET_PORT=443

           REPLICATE_MASTER_EXCHANGE_NAME=security_service

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

           # Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...

           #REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:&lt;server-name&gt; permission)

				configuration/environments/replica
			
          @@ -8,4 +8,4 @@ REPLICATE_MASTER_QUEUE_HOST=rabbit.internal.sapsailing.com

           REPLICATE_MASTER_QUEUE_PORT=5672

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dorg.eclipse.jetty.LEVEL=OFF -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -XX:ThreadPriorityPolicy=2"

           # Activate SAP Branding

          -ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

				configuration/on-site-scripts/paris2024/launch-replicas-in-region.sh
			
          @@ -83,7 +83,7 @@ REPLICATE_MASTER_EXCHANGE_NAME=paris2024

           REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com

           REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}

           GOOGLE_MAPS_AUTHENTICATION_PARAMS=\"${GOOGLE_MAPS_AUTHENTICATION_PARAMS}\"

          -ADDITIONAL_JAVA_ARGS=\"\${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true ${SECURITY_OPTIONS}\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)},{Key=sailing-analytics-server,Value=paris2024}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)}]" | jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )

          +ADDITIONAL_JAVA_ARGS=\"\${ADDITIONAL_JAVA_ARGS} ${SECURITY_OPTIONS}\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)},{Key=sailing-analytics-server,Value=paris2024}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)}]" | jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )

             EXIT_CODE=$?

             if [ "${EXIT_CODE}" != "0" ]; then

               echo "Error launching instance in region ${REGION}. Exiting with status ${EXIT_CODE}"

				configuration/on-site-scripts/paris2024/sap-p1-1/master.conf
			
          @@ -13,7 +13,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           MANAGE2SAIL_ACCESS_TOKEN=...

           IGTIMI_CLIENT_ID=...

				configuration/on-site-scripts/paris2024/sap-p1-1/security_service.conf
			
          @@ -15,5 +15,4 @@ REPLICATION_HOST=sap-p1-1

           REPLICATION_PORT=5672

           # To enable the use of the shared SecurityService and SharedSailingData from security-service.sapsailing.com:

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://((.*\.)?sapsailing\.com)|((.*\.)?sailing\.omegatiming\.com)(:[0-9]*)?$"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           MEMORY="4g"

				configuration/on-site-scripts/paris2024/sap-p1-2/master.conf
			
          @@ -21,7 +21,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           MANAGE2SAIL_ACCESS_TOKEN=...

           IGTIMI_CLIENT_ID=...

				configuration/on-site-scripts/paris2024/sap-p1-2/secondary_master.conf
			
          @@ -15,7 +15,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=false -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           MANAGE2SAIL_ACCESS_TOKEN=...

           IGTIMI_CLIENT_ID=...

				configuration/on-site-scripts/paris2024/sap-p1-2/security_service.conf
			
          @@ -15,5 +15,4 @@ REPLICATION_HOST=sap-p1-1

           REPLICATION_PORT=5672

           # To enable the use of the shared SecurityService and SharedSailingData from security-service.sapsailing.com:

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://((.*\.)?sapsailing\.com)|((.*\.)?sailing\.omegatiming\.com)(:[0-9]*)?$"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           MEMORY="4g"

				configuration/on-site-scripts/tokyo2020/launch-replicas-in-region.sh
			
          @@ -78,8 +78,7 @@ REPLICATE_MASTER_SERVLET_HOST=tokyo-ssh.internal.sapsailing.com

           REPLICATE_MASTER_SERVLET_PORT=8888

           REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020

           REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com

          -REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}

          -ADDITIONAL_JAVA_ARGS=\"${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)},{Key=sailing-analytics-server,Value=tokyo2020}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)}]" | jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )

          +REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)},{Key=sailing-analytics-server,Value=tokyo2020}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)}]" | jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )

             EXIT_CODE=$?

             if [ "${EXIT_CODE}" != "0" ]; then

               echo "Error launching instance in region ${REGION}. Exiting with status ${EXIT_CODE}"

				configuration/on-site-scripts/tokyo2020/sap-p1-1/master.conf
			
          @@ -13,4 +13,4 @@ REPLICATE_MASTER_BEARER_TOKEN="..."

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

				configuration/on-site-scripts/tokyo2020/sap-p1-1/security_service.conf
			
          @@ -15,5 +15,4 @@ REPLICATION_HOST=sap-p1-1

           REPLICATION_PORT=5672

           # To enable the use of the shared SecurityService and SharedSailingData from security-service.sapsailing.com:

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sapsailing\.com(:[0-9]*)?$"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           MEMORY="4g"

				configuration/on-site-scripts/tokyo2020/sap-p1-2/master.conf
			
          @@ -14,4 +14,4 @@ REPLICATE_MASTER_BEARER_TOKEN="..."

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

				configuration/on-site-scripts/tokyo2020/sap-p1-2/replica.conf
			
          @@ -16,4 +16,3 @@ REPLICATION_HOST=localhost

           REPLICATION_PORT=5672

           REPLICATION_CHANNEL=${SERVER_NAME}-replica

           USE_ENVIRONMENT=live-replica-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

				configuration/on-site-scripts/tokyo2020/sap-p1-2/security_service.conf
			
          @@ -15,5 +15,4 @@ REPLICATION_HOST=sap-p1-1

           REPLICATION_PORT=5672

           # To enable the use of the shared SecurityService and SharedSailingData from security-service.sapsailing.com:

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sapsailing\.com(:[0-9]*)?$"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           MEMORY="4g"

				java/com.sap.sailing.server/SailingServer (No Proxy, Axel).launch
			
          @@ -24,7 +24,7 @@

               <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

               <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console 12001 -clean"/>

               <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

          -    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -Dmongo.uri=&quot;mongodb://silent,klo,homemp3/winddb?replicaSet=rs0&amp;retryWrites=true&quot; -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dchargebee.site=${CHARGEBEE_SITE} -Dchargebee.apikey=${CHARGEBEE_API_KEY} -Dmanage2sail.accesstoken=${MANAGE2SAIL_ACCESS_TOKEN} -Dsubscriptions.disableMailVerificationRequirement=true -Dgoogle.maps.authenticationparams=${GOOGLE_MAPS_AUTHENTICATION_PARAMS} -Dyoutube.api.key=${YOUTUBE_API_KEY} -Dgwt.rpc.version=9 -Digtimi.riot.port=6000 -Digtimi.base.url=http://127.0.0.1:8888 -Dcom.sap.sse.debranding=false -Dgeonames.org.usernames=&quot;${GEONAMES_ORG_USERNAMES}&quot;"/>

          +    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -Dmongo.uri=&quot;mongodb://silent,klo,homemp3/winddb?replicaSet=rs0&amp;retryWrites=true&quot; -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dchargebee.site=${CHARGEBEE_SITE} -Dchargebee.apikey=${CHARGEBEE_API_KEY} -Dmanage2sail.accesstoken=${MANAGE2SAIL_ACCESS_TOKEN} -Dsubscriptions.disableMailVerificationRequirement=true -Dgoogle.maps.authenticationparams=${GOOGLE_MAPS_AUTHENTICATION_PARAMS} -Dyoutube.api.key=${YOUTUBE_API_KEY} -Dgwt.rpc.version=9 -Digtimi.riot.port=6000 -Digtimi.base.url=http://127.0.0.1:8888 -Dcom.sap.sse.branding=SAP -Dgeonames.org.usernames=&quot;${GEONAMES_ORG_USERNAMES}&quot;"/>

               <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>

               <stringAttribute key="pde.version" value="3.3"/>

               <stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>

				java/com.sap.sailing.server/SailingServer (No Proxy, debranding active).launch
			
          @@ -20,7 +20,7 @@

               <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

               <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>

               <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

          -    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sap.sse.debranding=true -ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dgeonames.org.usernames=&quot;${GEONAMES_ORG_USERNAMES}&quot;"/>

          +    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dgeonames.org.usernames=&quot;${GEONAMES_ORG_USERNAMES}&quot;"/>

               <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>

               <stringAttribute key="pde.version" value="3.3"/>

               <stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>

				java/com.sap.sailing.www/release_notes_admin.html
			
          @@ -30,6 +30,13 @@

                               season, create a pairing list for that and the copy sub-sequences from it to

                               the regattas of the individual events. This can help improve the fairness of

                               pairing lists across an entire season.</li>

          +                <li>Branding is now more configurable. Instead of using system property <pre>-Dcom.sap.sse.debranding=false</pre>

          +                    to request SAP branding you now have to set system property <pre>-Dcom.sap.sse.branding=SAP</pre> for

          +                    SAP's branding. With this, branding generally becomes pluggable. Alternative branding may be provided

          +                    by registering a service for type <tt>com.sap.sse.branding.BrandingConfiguration</tt> with the OSGi

          +                    service registry, adding the <tt>com.sap.sse.branding</tt> attribute in the registration's dictionary,

          +                    setting the value to the ID that can then be selected by the <tt>com.sap.sse.branding</tt> system

          +                    property.</li>

                     </ul>

                     <h2 class="articleSubheadline">June 2025</h2>

                     <ul class="bulletList">

				java/target/env.sh
			
          @@ -120,11 +120,11 @@ else

             JAVA_VERSION_SPECIFIC_ARGS=$JAVA_8_ARGS

           fi

          -# White labeling / SAP Branding: use -Dcom.sap.sse.debranding=false to show SAP branding images and text.

          +# White labeling / SAP Branding: use -Dcom.sap.sse.branding=SAP to show SAP branding images and text.

           # Note: This is allowed only for versions of this software that have been reviewed by SAP, e.g., have come

           # from an SAP-controlled Git repository such as github.com/SAP/sailing-analytics. In all other cases, the

           # usual restrictions for the use of the SAP brand and logo apply. See also https://brand.sap.com/

          -#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"

          +#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

           # Anniversary calculation:

           #ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -DAnniversaryRaceDeterminator.enabled=true"

           ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -Drestore.tracked.races=true -XX:MaxGCPauseMillis=500 -Dorg.eclipse.jetty.LEVEL=OFF -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog"

				wiki/howto/whitelabelling.md
			
          @@ -3,7 +3,7 @@ Changes regarding whitellabelling are collected here:

           Runtime configuration of debranding:

          -1. The activation of the debranding could be done by providing a system property during startup of the server side application, e.g. -Dcom.sap.sse.debranding=true

          +1. The activation of the debranding could be done by providing a system property during startup of the server side application, e.g. -Dcom.sap.sse.branding=SAP

           2. The debranding switch is delivered to the clients within the startup pages.

           Therefore we can put placeholders inside the existing static pages and deliver them through servlets to the client. The servlets will process the placeholders in the pages. The debranding switch will show up in the page. The GWT client can read this information during startup in the browser. The URLs for loading the pages are unchanged.

          \ No newline at end of file

				wiki/info/landscape/amazon-ec2.md
			
          @@ -889,7 +889,7 @@ To set up a multi instance for a server with name "SSV", subdomain "ssv.sapsaili

           8. White label switch, uncomment this line in env.sh

              <pre>

          -   #ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=true"

          +   #ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

              </pre>

              to enable white labeling.

				wiki/info/landscape/paris2024/olympic-plan-for-paris-marseille-2024.md
			
          @@ -54,7 +54,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888

           REPLICATE_MASTER_EXCHANGE_NAME=paris2024

           REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com

           REPLICATE_MASTER_BEARER_TOKEN="***"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ```

           Make sure to align the ``INSTALL_FROM_RELEASE`` parameter to match up with the release used on site.

				wiki/info/landscape/paris2024/olympic-setup.md
			
          @@ -563,7 +563,7 @@ REPLICATE_MASTER_BEARER_TOKEN="***"

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           # Place additional secrets here, e.g., from root@sapsailing.com:secrets

           MANAGE2SAIL_ACCESS_TOKEN=...

          @@ -597,7 +597,7 @@ REPLICATE_MASTER_BEARER_TOKEN="***"

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

          +ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           # Place additional secrets here, e.g., from root@sapsailing.com:secrets

           MANAGE2SAIL_ACCESS_TOKEN=...

          @@ -634,7 +634,6 @@ REPLICATION_HOST=localhost

           REPLICATION_PORT=5672

           REPLICATION_CHANNEL=${SERVER_NAME}-replica

           USE_ENVIRONMENT=live-replica-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           # Place additional secrets here, e.g., from root@sapsailing.com:secrets

           GOOGLE_MAPS_AUTHENTICATION_PARAMS="..."

          @@ -656,7 +655,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888

           REPLICATE_MASTER_EXCHANGE_NAME=paris2024

           REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com

           REPLICATE_MASTER_BEARER_TOKEN="***"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.*\.)?sailing\.omegatiming\.com(:[0-9]*)?$"

           # Place additional secrets here, e.g., from root@sapsailing.com:secrets

           GOOGLE_MAPS_AUTHENTICATION_PARAMS="..."

				wiki/info/landscape/tokyo2020/olympic-setup.md
			
          @@ -502,7 +502,6 @@ REPLICATE_MASTER_BEARER_TOKEN="***"

           REPLICATION_HOST=localhost

           REPLICATION_PORT=5673

           USE_ENVIRONMENT=live-master-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ```

           ### Replicas

          @@ -532,7 +531,6 @@ REPLICATION_HOST=localhost

           REPLICATION_PORT=5672

           REPLICATION_CHANNEL=${SERVER_NAME}-replica

           USE_ENVIRONMENT=live-replica-server

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ```

           Replicas in region ``eu-west-1`` can be launched using the following user data, making use of the established MongoDB live replica set in the region:

          @@ -549,7 +547,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888

           REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020

           REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com

           REPLICATE_MASTER_BEARER_TOKEN="***"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ```

           (Adjust the release accordingly, of course). (NOTE: During the first production days of the event we noticed that it was really a BAD IDEA to have all replicas use the same DB set-up, all writing to the MongoDB PRIMARY of the "live" replica set in eu-west-1. With tens of replicas running concurrently, this led to a massive block-up based on MongoDB not writing fast enough. This gave rise to a new application server AMI which now has a MongoDB set-up included, using "replica" as the MongoDB replica set name. Now, each replica hence can write into its own MongoDB instance, isolated from all others and scaling linearly.)

          @@ -568,7 +565,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888

           REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020

           REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com

           REPLICATE_MASTER_BEARER_TOKEN="***"

          -ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

           ```

           ### Application Servers

...	...	@@ -889,7 +889,7 @@ To set up a multi instance for a server with name "SSV", subdomain "ssv.sapsaili
889	889
890	890	8. White label switch, uncomment this line in env.sh
891	891	<pre>
892		- #ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=true"
	892	+ #ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
893	893	</pre>
894	894	to enable white labeling.
895	895

...	...	@@ -13,7 +13,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com
13	13	REPLICATE_MASTER_SERVLET_PORT=443
14	14	REPLICATE_MASTER_EXCHANGE_NAME=security_service
15	15	# Activate SAP Branding
16		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	16	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
17	17	# Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...
18	18	#REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:<server-name> permission)
19	19	#REPLICATE_MASTER_PASSWORD=(password of the user for replication login on security-service.sapsailing.com)

...	...	@@ -8,7 +8,7 @@ REPLICATE_ON_START=com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sailing
8	8	REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com
9	9	REPLICATE_MASTER_EXCHANGE_NAME=security_service
10	10	# Activate SAP Branding
11		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	11	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
12	12	# Provide authentication credentials for a user on the security-service.sapsailing.com permitted to replicate, either by username/password...
13	13	#REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:<server-name> permission)
14	14	#REPLICATE_MASTER_PASSWORD=(password of the user for replication login on security-service.sapsailing.com)

...	...	@@ -1,4 +1,4 @@
1	1	AUTO_REPLICATE=true
2	2	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sapsailing\.com(:[0-9])?$"
3	3	# Activate SAP Branding
4		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	4	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

...	...	@@ -19,7 +19,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com
19	19	REPLICATE_MASTER_SERVLET_PORT=443
20	20	REPLICATE_MASTER_EXCHANGE_NAME=security_service
21	21	# Activate SAP Branding
22		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	22	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
23	23
24	24	# Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...
25	25	#REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:<server-name> permission)

...	...	@@ -25,7 +25,7 @@ REPLICATE_MASTER_SERVLET_HOST=security-service.sapsailing.com
25	25	REPLICATE_MASTER_SERVLET_PORT=443
26	26	REPLICATE_MASTER_EXCHANGE_NAME=security_service
27	27	# Activate SAP Branding
28		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	28	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
29	29
30	30	# Provide authentication credentials for a user on security-service.sapsailing.com permitted to replicate, either by username/password...
31	31	#REPLICATE_MASTER_USERNAME=(user for replicator login on security-service.sapsailing.com server having SERVER:REPLICATE:<server-name> permission)

...	...	@@ -8,4 +8,4 @@ REPLICATE_MASTER_QUEUE_HOST=rabbit.internal.sapsailing.com
8	8	REPLICATE_MASTER_QUEUE_PORT=5672
9	9	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dorg.eclipse.jetty.LEVEL=OFF -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -XX:ThreadPriorityPolicy=2"
10	10	# Activate SAP Branding
11		-ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	11	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"

...	...	@@ -83,7 +83,7 @@ REPLICATE_MASTER_EXCHANGE_NAME=paris2024
83	83	REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com
84	84	REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}
85	85	GOOGLE_MAPS_AUTHENTICATION_PARAMS=\"${GOOGLE_MAPS_AUTHENTICATION_PARAMS}\"
86		-ADDITIONAL_JAVA_ARGS=\"\${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true ${SECURITY_OPTIONS}\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)},{Key=sailing-analytics-server,Value=paris2024}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)}]" \| jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )
	86	+ADDITIONAL_JAVA_ARGS=\"\${ADDITIONAL_JAVA_ARGS} ${SECURITY_OPTIONS}\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)},{Key=sailing-analytics-server,Value=paris2024}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Paris2024 (Upgrade Replica)}]" \| jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )
87	87	EXIT_CODE=$?
88	88	if [ "${EXIT_CODE}" != "0" ]; then
89	89	echo "Error launching instance in region ${REGION}. Exiting with status ${EXIT_CODE}"

...	...	@@ -13,7 +13,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."
13	13	REPLICATION_HOST=localhost
14	14	REPLICATION_PORT=5673
15	15	USE_ENVIRONMENT=live-master-server
16		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"
	16	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"
17	17	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
18	18	MANAGE2SAIL_ACCESS_TOKEN=...
19	19	IGTIMI_CLIENT_ID=...

...	...	@@ -15,5 +15,4 @@ REPLICATION_HOST=sap-p1-1
15	15	REPLICATION_PORT=5672
16	16	# To enable the use of the shared SecurityService and SharedSailingData from security-service.sapsailing.com:
17	17	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sapsailing.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://((.\.)?sapsailing\.com)\|((.\.)?sailing\.omegatiming\.com)(:[0-9]*)?$"
18		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
19	18	MEMORY="4g"

...	...	@@ -21,7 +21,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."
21	21	REPLICATION_HOST=localhost
22	22	REPLICATION_PORT=5673
23	23	USE_ENVIRONMENT=live-master-server
24		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
	24	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
25	25	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
26	26	MANAGE2SAIL_ACCESS_TOKEN=...
27	27	IGTIMI_CLIENT_ID=...

...	...	@@ -15,7 +15,7 @@ REPLICATE_MASTER_BEARER_TOKEN="..."
15	15	REPLICATION_HOST=localhost
16	16	REPLICATION_PORT=5673
17	17	USE_ENVIRONMENT=live-master-server
18		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=false -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"
	18	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443 -Daws.region=eu-west-1"
19	19	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
20	20	MANAGE2SAIL_ACCESS_TOKEN=...
21	21	IGTIMI_CLIENT_ID=...

...	...	@@ -78,8 +78,7 @@ REPLICATE_MASTER_SERVLET_HOST=tokyo-ssh.internal.sapsailing.com
78	78	REPLICATE_MASTER_SERVLET_PORT=8888
79	79	REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020
80	80	REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com
81		-REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}
82		-ADDITIONAL_JAVA_ARGS=\"${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true\"" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)},{Key=sailing-analytics-server,Value=tokyo2020}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)}]" \| jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )
	81	+REPLICATE_MASTER_BEARER_TOKEN=${BEARER_TOKEN}" --ebs-optimized --key-name $KEY_NAME --tag-specifications "ResourceType=instance,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)},{Key=sailing-analytics-server,Value=tokyo2020}]" "ResourceType=volume,Tags=[{Key=Name,Value=SL Tokyo2020 (Upgrade Replica)}]" \| jq -r '.Instances[].PrivateIpAddress + " " + .Instances[].InstanceId' )
83	82	EXIT_CODE=$?
84	83	if [ "${EXIT_CODE}" != "0" ]; then
85	84	echo "Error launching instance in region ${REGION}. Exiting with status ${EXIT_CODE}"

...	...	@@ -13,4 +13,4 @@ REPLICATE_MASTER_BEARER_TOKEN="..."
13	13	REPLICATION_HOST=localhost
14	14	REPLICATION_PORT=5673
15	15	USE_ENVIRONMENT=live-master-server
16		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
	16	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

...	...	@@ -14,4 +14,4 @@ REPLICATE_MASTER_BEARER_TOKEN="..."
14	14	REPLICATION_HOST=localhost
15	15	REPLICATION_PORT=5673
16	16	USE_ENVIRONMENT=live-master-server
17		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
	17	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"

...	...	@@ -16,4 +16,3 @@ REPLICATION_HOST=localhost
16	16	REPLICATION_PORT=5672
17	17	REPLICATION_CHANNEL=${SERVER_NAME}-replica
18	18	USE_ENVIRONMENT=live-replica-server
19		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"

...	...	@@ -24,7 +24,7 @@
24	24	<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
25	25	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console 12001 -clean"/>
26	26	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
27		- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -Dmongo.uri="mongodb://silent,klo,homemp3/winddb?replicaSet=rs0&retryWrites=true" -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dchargebee.site=${CHARGEBEE_SITE} -Dchargebee.apikey=${CHARGEBEE_API_KEY} -Dmanage2sail.accesstoken=${MANAGE2SAIL_ACCESS_TOKEN} -Dsubscriptions.disableMailVerificationRequirement=true -Dgoogle.maps.authenticationparams=${GOOGLE_MAPS_AUTHENTICATION_PARAMS} -Dyoutube.api.key=${YOUTUBE_API_KEY} -Dgwt.rpc.version=9 -Digtimi.riot.port=6000 -Digtimi.base.url=http://127.0.0.1:8888 -Dcom.sap.sse.debranding=false -Dgeonames.org.usernames="${GEONAMES_ORG_USERNAMES}""/>
	27	+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -Dmongo.uri="mongodb://silent,klo,homemp3/winddb?replicaSet=rs0&retryWrites=true" -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dchargebee.site=${CHARGEBEE_SITE} -Dchargebee.apikey=${CHARGEBEE_API_KEY} -Dmanage2sail.accesstoken=${MANAGE2SAIL_ACCESS_TOKEN} -Dsubscriptions.disableMailVerificationRequirement=true -Dgoogle.maps.authenticationparams=${GOOGLE_MAPS_AUTHENTICATION_PARAMS} -Dyoutube.api.key=${YOUTUBE_API_KEY} -Dgwt.rpc.version=9 -Digtimi.riot.port=6000 -Digtimi.base.url=http://127.0.0.1:8888 -Dcom.sap.sse.branding=SAP -Dgeonames.org.usernames="${GEONAMES_ORG_USERNAMES}""/>
28	28	<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
29	29	<stringAttribute key="pde.version" value="3.3"/>
30	30	<stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>

...	...	@@ -20,7 +20,7 @@
20	20	<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
21	21	<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
22	22	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
23		- <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.sap.sse.debranding=true -ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dgeonames.org.usernames="${GEONAMES_ORG_USERNAMES}""/>
	23	+ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Dwindestimation.source.url=https://www.sapsailing.com -Drestore.tracked.races=true -Dorg.eclipse.jetty.server.Request.maxFormContentSize=50000000 -DAnniversaryRaceDeterminator.enabled=true -Djava.naming.factory.url.pkgs=org.eclipse.jetty.jndi -Djava.naming.factory.initial=org.eclipse.jetty.jndi.InitialContextFactory -Dorg.eclipse.jetty.annotations.maxWait=120 -Dgeonames.org.usernames="${GEONAMES_ORG_USERNAMES}""/>
24	24	<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
25	25	<stringAttribute key="pde.version" value="3.3"/>
26	26	<stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>

...	...	@@ -30,6 +30,13 @@
30	30	season, create a pairing list for that and the copy sub-sequences from it to
31	31	the regattas of the individual events. This can help improve the fairness of
32	32	pairing lists across an entire season.</li>
	33	+ <li>Branding is now more configurable. Instead of using system property <pre>-Dcom.sap.sse.debranding=false</pre>
	34	+ to request SAP branding you now have to set system property <pre>-Dcom.sap.sse.branding=SAP</pre> for
	35	+ SAP's branding. With this, branding generally becomes pluggable. Alternative branding may be provided
	36	+ by registering a service for type <tt>com.sap.sse.branding.BrandingConfiguration</tt> with the OSGi
	37	+ service registry, adding the <tt>com.sap.sse.branding</tt> attribute in the registration's dictionary,
	38	+ setting the value to the ID that can then be selected by the <tt>com.sap.sse.branding</tt> system
	39	+ property.</li>
33	40	</ul>
34	41	<h2 class="articleSubheadline">June 2025</h2>
35	42	<ul class="bulletList">

...	...	@@ -120,11 +120,11 @@ else
120	120	JAVA_VERSION_SPECIFIC_ARGS=$JAVA_8_ARGS
121	121	fi
122	122
123		-# White labeling / SAP Branding: use -Dcom.sap.sse.debranding=false to show SAP branding images and text.
	123	+# White labeling / SAP Branding: use -Dcom.sap.sse.branding=SAP to show SAP branding images and text.
124	124	# Note: This is allowed only for versions of this software that have been reviewed by SAP, e.g., have come
125	125	# from an SAP-controlled Git repository such as github.com/SAP/sailing-analytics. In all other cases, the
126	126	# usual restrictions for the use of the SAP brand and logo apply. See also https://brand.sap.com/
127		-#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.debranding=false"
	127	+#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sse.branding=SAP"
128	128	# Anniversary calculation:
129	129	#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -DAnniversaryRaceDeterminator.enabled=true"
130	130	ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -Drestore.tracked.races=true -XX:MaxGCPauseMillis=500 -Dorg.eclipse.jetty.LEVEL=OFF -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog"

...	...	@@ -3,7 +3,7 @@ Changes regarding whitellabelling are collected here:
3	3
4	4	Runtime configuration of debranding:
5	5
6		-1. The activation of the debranding could be done by providing a system property during startup of the server side application, e.g. -Dcom.sap.sse.debranding=true
	6	+1. The activation of the debranding could be done by providing a system property during startup of the server side application, e.g. -Dcom.sap.sse.branding=SAP
7	7
8	8	2. The debranding switch is delivered to the clients within the startup pages.
9	9	Therefore we can put placeholders inside the existing static pages and deliver them through servlets to the client. The servlets will process the placeholders in the pages. The debranding switch will show up in the page. The GWT client can read this information during startup in the browser. The URLs for loading the pages are unchanged.
...	...	\ No newline at end of file

...	...	@@ -54,7 +54,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888
54	54	REPLICATE_MASTER_EXCHANGE_NAME=paris2024
55	55	REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com
56	56	REPLICATE_MASTER_BEARER_TOKEN="***"
57		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
58	57	```
59	58
60	59	Make sure to align the ``INSTALL_FROM_RELEASE`` parameter to match up with the release used on site.

...	...	@@ -563,7 +563,7 @@ REPLICATE_MASTER_BEARER_TOKEN="***"
563	563	REPLICATION_HOST=localhost
564	564	REPLICATION_PORT=5673
565	565	USE_ENVIRONMENT=live-master-server
566		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
	566	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
567	567	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
568	568	# Place additional secrets here, e.g., from root@sapsailing.com:secrets
569	569	MANAGE2SAIL_ACCESS_TOKEN=...
...	...	@@ -597,7 +597,7 @@ REPLICATE_MASTER_BEARER_TOKEN="***"
597	597	REPLICATION_HOST=localhost
598	598	REPLICATION_PORT=5673
599	599	USE_ENVIRONMENT=live-master-server
600		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
	600	+ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dpolardata.source.url=https://www.sapsailing.com:22443 -Dwindestimation.source.url=https://www.sapsailing.com:22443"
601	601	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
602	602	# Place additional secrets here, e.g., from root@sapsailing.com:secrets
603	603	MANAGE2SAIL_ACCESS_TOKEN=...
...	...	@@ -634,7 +634,6 @@ REPLICATION_HOST=localhost
634	634	REPLICATION_PORT=5672
635	635	REPLICATION_CHANNEL=${SERVER_NAME}-replica
636	636	USE_ENVIRONMENT=live-replica-server
637		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
638	637	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
639	638	# Place additional secrets here, e.g., from root@sapsailing.com:secrets
640	639	GOOGLE_MAPS_AUTHENTICATION_PARAMS="..."
...	...	@@ -656,7 +655,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888
656	655	REPLICATE_MASTER_EXCHANGE_NAME=paris2024
657	656	REPLICATE_MASTER_QUEUE_HOST=rabbit-eu-west-3.sapsailing.com
658	657	REPLICATE_MASTER_BEARER_TOKEN="***"
659		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
660	658	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dsecurity.sharedAcrossSubdomainsOf=sailing.omegatiming.com -Dsecurity.baseUrlForCrossDomainStorage=https://security-service.sapsailing.com -Dgwt.acceptableCrossDomainStorageRequestOriginRegexp=https?://(.\.)?sailing\.omegatiming\.com(:[0-9])?$"
661	659	# Place additional secrets here, e.g., from root@sapsailing.com:secrets
662	660	GOOGLE_MAPS_AUTHENTICATION_PARAMS="..."

...	...	@@ -502,7 +502,6 @@ REPLICATE_MASTER_BEARER_TOKEN="***"
502	502	REPLICATION_HOST=localhost
503	503	REPLICATION_PORT=5673
504	504	USE_ENVIRONMENT=live-master-server
505		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
506	505	```
507	506
508	507	### Replicas
...	...	@@ -532,7 +531,6 @@ REPLICATION_HOST=localhost
532	531	REPLICATION_PORT=5672
533	532	REPLICATION_CHANNEL=${SERVER_NAME}-replica
534	533	USE_ENVIRONMENT=live-replica-server
535		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
536	534	```
537	535
538	536	Replicas in region ``eu-west-1`` can be launched using the following user data, making use of the established MongoDB live replica set in the region:
...	...	@@ -549,7 +547,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888
549	547	REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020
550	548	REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com
551	549	REPLICATE_MASTER_BEARER_TOKEN="***"
552		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
553	550	```
554	551
555	552	(Adjust the release accordingly, of course). (NOTE: During the first production days of the event we noticed that it was really a BAD IDEA to have all replicas use the same DB set-up, all writing to the MongoDB PRIMARY of the "live" replica set in eu-west-1. With tens of replicas running concurrently, this led to a massive block-up based on MongoDB not writing fast enough. This gave rise to a new application server AMI which now has a MongoDB set-up included, using "replica" as the MongoDB replica set name. Now, each replica hence can write into its own MongoDB instance, isolated from all others and scaling linearly.)
...	...	@@ -568,7 +565,6 @@ REPLICATE_MASTER_SERVLET_PORT=8888
568	565	REPLICATE_MASTER_EXCHANGE_NAME=tokyo2020
569	566	REPLICATE_MASTER_QUEUE_HOST=rabbit-ap-northeast-1.sapsailing.com
570	567	REPLICATE_MASTER_BEARER_TOKEN="***"
571		-ADDITIONAL_JAVA_ARGS="${ADDITIONAL_JAVA_ARGS} -Dcom.sap.sse.debranding=true"
572	568	```
573	569
574	570	### Application Servers