Merge branch 'master' into permission-vertical

Change-Id: I7d8d8c2baa05eb066997de41f9e643e8f1128c01

docker/install-mongodb

@@ -1,4 +1,4 @@
 #!/bin/bash
 git clone https://github.com/kubernetes/charts.git
-cd /charts/stable/mongodb-replicaset
+cd charts/stable/mongodb-replicaset
 helm install --name=mongodb .

java/com.sap.sailing.gwt.ui/build.properties

@@ -54,5 +54,6 @@ bin.includes = META-INF/,\
                licenses/,\
                PairingList.css,\
                PairingList.html,\
-               com.sap.sailing.gwt.ui.PairingList/
+               com.sap.sailing.gwt.ui.PairingList/,\
+               src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/
 output.. = WEB-INF/classes/

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java

@@ -83,7 +83,7 @@ public class BoatClassImageResolver {
         boatClassIconsMap.put(BoatClassMasterdata.LASER_2.getDisplayName(), imageResources.Laser2Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_SB3.getDisplayName(), imageResources.LaserSB3Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_INT.getDisplayName(), imageResources.LaserIcon());
-        boatClassIconsMap.put(BoatClassMasterdata.LASER_4_7.getDisplayName(), imageResources.LaserIcon());
+        boatClassIconsMap.put(BoatClassMasterdata.LASER_4_7.getDisplayName(), imageResources.Laser47Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LASER_RADIAL.getDisplayName(), imageResources.LaserIcon());
         boatClassIconsMap.put(BoatClassMasterdata.LAGO_26.getDisplayName(), imageResources.Lago26Icon());
         boatClassIconsMap.put(BoatClassMasterdata.LONGTZE.getDisplayName(), imageResources.LongtzeIcon());

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java

@@ -36,7 +36,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource _470Icon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png")
     @ImageOptions(preventInlining = true)
     ImageResource _49erFXIcon();
 
@@ -48,7 +48,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource _505mIcon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png")
     @ImageOptions(preventInlining = true)
     ImageResource _5_5MRIcon();
     
@@ -192,7 +192,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource J111Icon();
 
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png")
     @ImageOptions(preventInlining = true)
     ImageResource Laser2Icon();
    
@@ -200,10 +200,14 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource LaserSB3Icon();
    
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png")
     @ImageOptions(preventInlining = true)
     ImageResource LaserIcon();
 
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png")
+    @ImageOptions(preventInlining = true)
+    ImageResource Laser47Icon();
+
     @Source("com/sap/sailing/gwt/ui/client/images/boatclass/LAGO_26.png")
     @ImageOptions(preventInlining = true)
     ImageResource Lago26Icon();
@@ -288,7 +292,7 @@ public interface BoatClassImageResources extends ClientBundle {
     @ImageOptions(preventInlining = true)
     ImageResource StreamlineIcon();
     
-    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM22.png")
+    @Source("com/sap/sailing/gwt/ui/client/images/boatclass/SUNBEAM_22.png")
     @ImageOptions(preventInlining = true)
     ImageResource Sunbeam22Icon();
     

java/com.sap.sailing.server.gateway.serialization.shared.android/src/com/sap/sailing/server/gateway/serialization/impl/BoatClassJsonSerializer.java

@@ -1,19 +1,38 @@
 package com.sap.sailing.server.gateway.serialization.impl;
 
+import java.util.Arrays;
+
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.BoatClass;
+import com.sap.sailing.domain.common.BoatClassMasterdata;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
 public class BoatClassJsonSerializer implements JsonSerializer<BoatClass> {
     public static final String FIELD_NAME = "name";
     public static final String FIELD_TYPICALLY_STARTS_UPWIND = "typicallyStartsUpwind";
-
+    public static final String FIELD_HULL_LENGTH_IN_METERS = "hullLengthInMeters";
+    public static final String FIELD_HULL_BEAM_IN_METERS = "hullBeamInMeters";
+    public static final String FIELD_DISPLAY_NAME = "displayName";
+    public static final String FIELD_ALIAS_NAMES = "aliasNames";
+    public static final String FIELD_ICON_URL = "iconUrl";
+    
     @Override
     public JSONObject serialize(BoatClass boatClass) {
         JSONObject result = new JSONObject();
         result.put(FIELD_NAME, boatClass.getName());
         result.put(FIELD_TYPICALLY_STARTS_UPWIND, boatClass.typicallyStartsUpwind());
+        result.put(FIELD_HULL_LENGTH_IN_METERS, boatClass.getHullLength().getMeters());
+        result.put(FIELD_HULL_BEAM_IN_METERS, boatClass.getHullBeam().getMeters());
+        result.put(FIELD_DISPLAY_NAME, boatClass.getDisplayName());
+        final BoatClassMasterdata masterData = BoatClassMasterdata.resolveBoatClass(boatClass.getDisplayName());
+        final JSONArray aliasNames = new JSONArray();
+        if (masterData != null) {
+            result.put(FIELD_ICON_URL, "/gwt/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/"+masterData.name().replaceAll("^_", "")+".png");
+            aliasNames.addAll(Arrays.asList(masterData.getAlternativeNames()));
+        }
+        result.put(FIELD_ALIAS_NAMES, aliasNames);
         return result;
     }
 }

java/com.sap.sse/src/com/sap/sse/impl/Activator.java

@@ -25,8 +25,12 @@ public class Activator implements BundleActivator {
             try {
                 // TODO figure out if we're in the middle of a graceful shutdown already and then skip this...
                 final Bundle systemBundle = context.getBundle(0);
-                logger.info("Found system bundle "+systemBundle.getSymbolicName());
-                systemBundle.stop();
+                if (systemBundle == null) {
+                    logger.warning("Couldn't find system bundle (anymore?). Perhaps already shut down.");
+                } else {
+                    logger.info("Found system bundle "+systemBundle.getSymbolicName());
+                    systemBundle.stop();
+                }
             } catch (BundleException e) {
                 logger.log(Level.WARNING, "Exception while trying to gracefully stop the OSGi framework", e);
             }