Changes in 82736db: documented the -Dcom.sap.sailing.domain.tracking.MailInvitationType property Change-Id: I94b85e8ce68a4c35c0715a714fc7b48820f62d44

				java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
			
          @@ -7590,7 +7590,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet

                       competitors.add(getCompetitor(c));

                   }

                   MailInvitationType type = MailInvitationType

          -                .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.LEGACY.name()));

          +                .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.SailInsight1.name()));

                   Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);

                   getSecurityService().checkCurrentUserUpdatePermission(leaderboard);

                   Regatta regatta = getService().getRegattaByName(leaderboardName);

          @@ -7611,7 +7611,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet

                   Regatta regatta = getService().getRegattaByName(leaderboardName);

                   getSecurityService().checkCurrentUserUpdatePermission(regatta);

                   MailInvitationType type = MailInvitationType

          -                .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.LEGACY.name()));

          +                .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.SailInsight1.name()));

                   getRaceLogTrackingAdapter().inviteBuoyTenderViaEmail(event, leaderboard, regatta, serverUrlWithoutTrailingSlash,

                           emails, iOSAppUrl, androidAppUrl, getLocale(localeInfoName), type);

               }

				wiki/info/landscape/amazon-ec2.md
			
          @@ -28,8 +28,15 @@ You may need to select "All generations" instead of "Current generation" to see 

             SERVER_NAME=MYSPECIFICEVENT

             BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com

             SERVER_STARTUP_NOTIFY=simon.marcel.pamies@sap.com

          +  ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"

             </pre>

          +The *MailInvitationType* property controls which version of the SAP Sail Insight app will be targeted by tracking invitations sent out by e-mail.

          +Two different Branch.io URL schemes exist for the Sail Insight app: sailinsight-app.sapsailing.com and sailinsight20-app.sapsailing.com.

          +They can be selected by providing *SailInsight1* or *SailInsight2*, respectively, as the values for the property. If the property is

          +set to *LEGACY*, no Branch.io link is used in the invitation at all. This mode should no longer be used as soon as the Branch.io-enabled

          +iOS app has hit the store. If not provided, it will default to *SailInsight1*.

          +

           Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_NAME` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.

           - To build from git, install and start, set the following in the instance's user data, adjusting the branch name (`BUILD_FROM`), the `myspecificevent` naming and memory settings according to your needs:

          @@ -68,6 +75,7 @@ SERVER_NAME=MYSPECIFICEVENT

           REPLICATION_CHANNEL=myspecificevent

           MONGODB_NAME=myspecificevent

           SERVER_STARTUP_NOTIFY=you@email.com

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"

           </pre>

           - After your master server is ready, note the internal IP and configure your replica instances. Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration. 

          @@ -87,15 +95,12 @@ SERVER_NAME=MYSPECIFICEVENT

           MONGODB_NAME=myspecificevent-replica

           EVENT_ID=&lt;some-uuid-of-an-event-you-want-to-feature&gt;

           SERVER_STARTUP_NOTIFY=you@email.com

          +ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"

           </pre>

          -

          -

           #### Setting up a Multi Instance

           To set up a multi instance for a server with name "SSV", subdomain "ssv.sapsailing.com" and description "Schwartauer Segler-Verein, [www.ssv-net.de](http://www.ssv-net.de), Alexander Probst, [webmaster@alexprobst.de](mailto:webmaster@alexprobst.de)" perform the following steps:

          -

          -

           ##### Instance configuration

           1. Connect to the EC2 instance where your multi instance should be deployed. For example: Connect to the instance "SL Multi-Instance Sailing Server" with dns name  "ec2-34-250-136-229.eu-west-1.compute.amazonaws.com" in region Ireland via SSH.

...	...	@@ -7590,7 +7590,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
7590	7590	competitors.add(getCompetitor(c));
7591	7591	}
7592	7592	MailInvitationType type = MailInvitationType
7593		- .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.LEGACY.name()));
	7593	+ .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.SailInsight1.name()));
7594	7594	Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
7595	7595	getSecurityService().checkCurrentUserUpdatePermission(leaderboard);
7596	7596	Regatta regatta = getService().getRegattaByName(leaderboardName);
...	...	@@ -7611,7 +7611,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
7611	7611	Regatta regatta = getService().getRegattaByName(leaderboardName);
7612	7612	getSecurityService().checkCurrentUserUpdatePermission(regatta);
7613	7613	MailInvitationType type = MailInvitationType
7614		- .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.LEGACY.name()));
	7614	+ .valueOf(System.getProperty(MAILTYPE_PROPERTY, MailInvitationType.SailInsight1.name()));
7615	7615	getRaceLogTrackingAdapter().inviteBuoyTenderViaEmail(event, leaderboard, regatta, serverUrlWithoutTrailingSlash,
7616	7616	emails, iOSAppUrl, androidAppUrl, getLocale(localeInfoName), type);
7617	7617	}

...	...	@@ -28,8 +28,15 @@ You may need to select "All generations" instead of "Current generation" to see
28	28	SERVER_NAME=MYSPECIFICEVENT
29	29	BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com
30	30	SERVER_STARTUP_NOTIFY=simon.marcel.pamies@sap.com
	31	+ ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"
31	32	</pre>
32	33
	34	+The MailInvitationType property controls which version of the SAP Sail Insight app will be targeted by tracking invitations sent out by e-mail.
	35	+Two different Branch.io URL schemes exist for the Sail Insight app: sailinsight-app.sapsailing.com and sailinsight20-app.sapsailing.com.
	36	+They can be selected by providing SailInsight1 or SailInsight2, respectively, as the values for the property. If the property is
	37	+set to LEGACY, no Branch.io link is used in the invitation at all. This mode should no longer be used as soon as the Branch.io-enabled
	38	+iOS app has hit the store. If not provided, it will default to SailInsight1.
	39	+
33	40	Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_NAME` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.
34	41
35	42	- To build from git, install and start, set the following in the instance's user data, adjusting the branch name (`BUILD_FROM`), the `myspecificevent` naming and memory settings according to your needs:
...	...	@@ -68,6 +75,7 @@ SERVER_NAME=MYSPECIFICEVENT
68	75	REPLICATION_CHANNEL=myspecificevent
69	76	MONGODB_NAME=myspecificevent
70	77	SERVER_STARTUP_NOTIFY=you@email.com
	78	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"
71	79	</pre>
72	80
73	81	- After your master server is ready, note the internal IP and configure your replica instances. Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration.
...	...	@@ -87,15 +95,12 @@ SERVER_NAME=MYSPECIFICEVENT
87	95	MONGODB_NAME=myspecificevent-replica
88	96	EVENT_ID=<some-uuid-of-an-event-you-want-to-feature>
89	97	SERVER_STARTUP_NOTIFY=you@email.com
	98	+ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"
90	99	</pre>
91	100
92		-
93		-
94	101	#### Setting up a Multi Instance
95	102	To set up a multi instance for a server with name "SSV", subdomain "ssv.sapsailing.com" and description "Schwartauer Segler-Verein, [www.ssv-net.de](http://www.ssv-net.de), Alexander Probst, [webmaster@alexprobst.de](mailto:webmaster@alexprobst.de)" perform the following steps:
96	103
97		-
98		-
99	104	##### Instance configuration
100	105
101	106	1. Connect to the EC2 instance where your multi instance should be deployed. For example: Connect to the instance "SL Multi-Instance Sailing Server" with dns name "ec2-34-250-136-229.eu-west-1.compute.amazonaws.com" in region Ireland via SSH.