From b22fc113363f8698582963ffaabf034fa9fad618 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 6 Dec 2018 21:59:02 +0100 Subject: [PATCH 1/2] during shutdown hook check whether system bundle was retrieved Change-Id: Id65d43766e86b5c621717fc431c4f73a26b80590 --- docker/install-mongodb | 2 +- java/com.sap.sse/src/com/sap/sse/impl/Activator.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/install-mongodb b/docker/install-mongodb index d68ff3ac2a7..9732aa98ed9 100755 --- a/docker/install-mongodb +++ b/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 . diff --git a/java/com.sap.sse/src/com/sap/sse/impl/Activator.java b/java/com.sap.sse/src/com/sap/sse/impl/Activator.java index 02f5d7009bb..86fe89afa13 100755 --- a/java/com.sap.sse/src/com/sap/sse/impl/Activator.java +++ b/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); } From 0262e5268a90ee3df23dec4d407db180ffa67f22 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 7 Dec 2018 00:28:56 +0100 Subject: [PATCH 2/2] aligned boat class icon file names with BoatClassMasterdata enum literals and expose icons through gwt.ui web bundle; added icon URLs and further fields to BoatClassesResource Change-Id: Ib0bc71521fbe173883ff9d55524a338f0b672f5b --- java/com.sap.sailing.gwt.ui/build.properties | 3 ++- .../common/client/BoatClassImageResolver.java | 2 +- .../client/BoatClassImageResources.java | 14 +++++++----- .../boatclass/{49ER_FX.png => 49ERFX.png} | Bin .../images/boatclass/{5.5mR.png => 5_5MR.png} | Bin .../boatclass/{LASER2.png => LASER_2.png} | Bin .../boatclass/{LASER.png => LASER_4_7.png} | Bin .../ui/client/images/boatclass/LASER_INT.png | Bin 0 -> 2556 bytes .../{SUNBEAM22.png => SUNBEAM_22.png} | Bin .../impl/BoatClassJsonSerializer.java | 21 +++++++++++++++++- 10 files changed, 32 insertions(+), 8 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/{49ER_FX.png => 49ERFX.png} (100%) rename java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/{5.5mR.png => 5_5MR.png} (100%) rename java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/{LASER2.png => LASER_2.png} (100%) rename java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/{LASER.png => LASER_4_7.png} (100%) mode change 100644 => 100755 create mode 100644 java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png rename java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/{SUNBEAM22.png => SUNBEAM_22.png} (100%) diff --git a/java/com.sap.sailing.gwt.ui/build.properties b/java/com.sap.sailing.gwt.ui/build.properties index dce51fb9065..db5af9e163b 100644 --- a/java/com.sap.sailing.gwt.ui/build.properties +++ b/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/ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java index 2c2d3dd4481..ce7e26637dc 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResolver.java +++ b/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()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java index 40efca2dfd9..d9ebbc3acb4 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/BoatClassImageResources.java +++ b/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(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ER_FX.png rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/49ERFX.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5.5mR.png rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/5_5MR.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER2.png rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_2.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png old mode 100644 new mode 100755 similarity index 100% rename from java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER.png rename to java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_4_7.png diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/client/images/boatclass/LASER_INT.png new file mode 100644 index 0000000000000000000000000000000000000000..39c2d28075010737b6adc7f583c5a1503579f564 GIT binary patch literal 2556 zcmbW3i9ZvJ1BWRxckFe}Iai9@*LWv#%~8Bj7>1GC^rja%TjprYeIKJ2l^m5LgdEe5 zjogb&w#ZwvY+A|ndw>7J`}sWI=ld@_*{)aYg#}~Z9|`!~ChBiHq+Dw3;lwTAfS7WTzd~#aZ`D7!fC?VAyOQ)k?swvL;-~z$ zLY|IeK(G_B{o^-fFFzW?hnJ>bIu61pmveqgJ!E)Rjv3ulNxdU7z1u?zBtlt^ziin; z*_+i`tQ*SANiF7U&cvtkST-L4O|3LU%xd@vDX+jJCO&v7kyF=igd=^*9uX&b(1-ZF05`8s9VA;P z*iW9uXjTT(35?5R)JIb^{918}W6r^BM82seBS<4G*vLb+ZyNF>oXp!LF!UP}s7^#BuufBLdUB=g6gk)@Z9)p3?Z$X7#t^q-(es(Ex;xw=D~ zs4r5EB8qO6X|5Yu^IZ#%e;$iANQqh1X>!Pz+ijySBgT*QDanuEHz0#*;P{IfQQVZa z(wDQ!<#=b413?@-czkZ;*7;dc@PSYtnQQq>5yMlZB_h8GL_vFoa8XJhb_z82oen%q z9rKIqAqTMHchH)*lBij4*oFv<4ZU}9Us@fUB3^lf>vlNc(sQM!TZ2WmZU5D0~K#IBDN>mdbPv5wW&&<-1z9iHZ1@T{Vsls zD!vhkkS}pdohXZquBADNfu9Jbe)j+nWR|Z(cCrqlzWj`F81%v&(Ys;+#H%4cwFt1$ z{>S+@!$iOVYtplQn)h^3!mtx864PHyUUWyz9e88UhlF&-UtcH+J(Yr1*hsW)^S!Uk z+ZyFq;E+_8*w0kdOE!tiH2qPZ9}kvF`DFUud7@=(w}f>C!aIs%jq-);m+}QxT{o;Z zS3F!1@{~mO1fW{L%kByhp3nDkV|1CR+yhpK3 z=IVaa4I;*GjQ|!!XB~~y1AQ}|03)2teHEPWX&H4W`g9lIoMOwc!Ow8kUCVziG8^Eg zP#opMuDXGgdKlSC>8t&~$~Z6~R8}K~J1>rlfzMmLz>6YwyWqKvrXZIzb-ur-<#{>>`e?u=ly->m1jm@@_q6&yrqbTpZ+$=jo~@{fW%5q|8bFoL=12{UBsM7Ni+$K+ za39YLnKuQsPcN4p&88EcpBno$+10Q+_ETn1Lap7X#s62(XVa>5+sI)4GE?kx4bs|8 z%H)Y%_ouEsA?QV7XeZ+MT?yH;kk}lmwc~|`R&KPlUS7=J>p(nLu@Qc*b%q%rA1BrK z3Z>7Xm}NE0w&aH2-`pEe4#VR*4odR-T_3n{{GNxC2!Ge1x8W1T-rByjc>R*90xC7z^0I0F09Upb_xsi zzWGyR9COIuDD>g;qB3%75!o#Z;pRB9N$vWL_TToQ9Xa2@klHMdQ|u`@s$}d*sn}CM zt(#GaV!fe>lh?`0HL@tXs#9vYke8Dj8d!q2?iFiHkU03jOO)74fI8w9=4F=orwLZw zh(`kj38nJZlKly_kF__8fKFHclzf>Y()rwKe5AV|7H9rV#Gug*;qEoOtK1popuN#p zAA4xTyZV%LDE%tvC1B~PNJY=!fQ3)0wWi6Jzfb!qbX_P3xOgLTZICCz}5s1hXUgnS=X27aqm^wXZ^riEn){ z3s~DbQ%eLnc6-b3{BV==VsA!`M|cR0^9_FDInXL7eq|f#f;>doJ`O+0#nTzTfF!r; zTzc#{ee9-_|LgRxM*-#qk@sCB++8B_AojgjwQ_DX;m74S6Lktu>*Z1tDlHj@=7}cxMp8j17=!ess{8qEzQ+LPH6V1c zBPqe!Z%Y@pz35Cu&Wf`&WbBXhR((nThzj=5Wd;I@+8P6FOI}SV-4{_G zu5L8Z3=(%nL { 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; } }