Merge remote-tracking branch 'origin/master' into mark-rounding-inference

This commit is contained in:
Nicolas committed 2014-06-26 16:08:34 +02:00
commit 5f32d7bfe3
2 files changed
+13 -13

No files matched your search

@@ -23,6 +23,8 @@ import com.sap.sse.gwt.client.EntryPointHelper;
import com.sap.sse.gwt.shared.GwtHttpRequestUtils;
public class TVEntryPoint extends AbstractEntryPoint {
private static final String PARAM_LEADERBOARD_NAME = "name";
private static final String PARAM_LEADERBOARD_GROUP_NAME = "leaderboardGroupName";
private static final String PARAM_EMBEDDED = "embedded";
private static final String PARAM_SHOW_RACE_DETAILS = "showRaceDetails";
@@ -42,10 +44,8 @@ public class TVEntryPoint extends AbstractEntryPoint {
EntryPointHelper.registerASyncService((ServiceDefTarget) sailingService, RemoteServiceMappingConstants.sailingServiceRemotePath);
EntryPointHelper.registerASyncService((ServiceDefTarget) mediaService, RemoteServiceMappingConstants.mediaServiceRemotePath);
final boolean showRaceDetails = Window.Location.getParameter(PARAM_SHOW_RACE_DETAILS) != null
&& Window.Location.getParameter(PARAM_SHOW_RACE_DETAILS).equalsIgnoreCase("true");
final boolean embedded = Window.Location.getParameter(PARAM_EMBEDDED) != null
&& Window.Location.getParameter(PARAM_EMBEDDED).equalsIgnoreCase("true");
final boolean showRaceDetails = GwtHttpRequestUtils.getBooleanParameter(PARAM_SHOW_RACE_DETAILS, true);
final boolean embedded = GwtHttpRequestUtils.getBooleanParameter(PARAM_EMBEDDED, false);
final long delayToLiveMillis = Window.Location.getParameter(PARAM_DELAY_TO_LIVE_MILLIS) != null ? Long
.valueOf(Window.Location.getParameter(PARAM_DELAY_TO_LIVE_MILLIS)) : 5000l; // default 5s
final boolean showNavigationPanel = GwtHttpRequestUtils.getBooleanParameter(
@@ -65,7 +65,7 @@ public class TVEntryPoint extends AbstractEntryPoint {
sailingService.getLeaderboardNames(new AsyncCallback<List<String>>() {
@Override
public void onSuccess(List<String> leaderboardNames) {
leaderboardName = Window.Location.getParameter("name");
leaderboardName = Window.Location.getParameter(PARAM_LEADERBOARD_NAME);
leaderboardGroupName = Window.Location.getParameter(PARAM_LEADERBOARD_GROUP_NAME);
if (leaderboardNames.contains(leaderboardName)) {
createUI(showRaceDetails, embedded, showNavigationPanel, delayToLiveMillis);
+8 -8
View File
@@ -10,23 +10,23 @@ ELB-based replication cluster:
User data for master:
<pre>
MONGODB_NAME=KW2014
REPLICATION_CHANNEL=KW2014
MONGODB_NAME=KW2014-ELB
REPLICATION_CHANNEL=KW2014-ELB
SERVER_STARTUP_NOTIFY=axel.uhl@sap.com
SERVER_NAME=KW2014
SERVER_NAME=KW2014-ELB-MASTER
USE_ENVIRONMENT=live-master-server
INSTALL_FROM_RELEASE=kiwo2014-release-201406241522
INSTALL_FROM_RELEASE=kiwo2014-release-201406260007
MEMORY=20000m
</pre>
User data for replicas:
<pre>
MONGODB_NAME=KW2014
REPLICATION_CHANNEL=KW2014
MONGODB_NAME=KW2014-ELB
REPLICATION_CHANNEL=KW2014-ELB
SERVER_STARTUP_NOTIFY=axel.uhl@sap.com
SERVER_NAME=KW2014
REPLICATE_MASTER_SERVLET_HOST=ec2-54-76-178-149.eu-west-1.compute.amazonaws.com
SERVER_NAME=KW2014-REPLICA3
REPLICATE_MASTER_SERVLET_HOST=XXX.XXX.XXX.XXX
USE_ENVIRONMENT=live-replica-server
INSTALL_FROM_RELEASE=kiwo2014-release-201406260007
MEMORY=20000m