merge

configuration/buildAndUpdateProduct.sh

@@ -589,6 +589,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
 	    #build local p2 repo
 	    echo "Using following command (pwd: java/com.sap.sailing.targetplatform.base): mvn -fae -s $MAVEN_SETTINGS $clean compile"
 	    echo "Maven version used: `mvn --version`"
+            echo "JAVA_HOME used: $JAVA_HOME"
 	    (cd com.sap.$PROJECT_TYPE.targetplatform.base; mvn -fae -s $MAVEN_SETTINGS $clean compile 2>&1 | tee -a $START_DIR/build.log)
 	    # now get the exit status from mvn, and not that of tee which is what $? contains now
 	    MVN_EXIT_CODE=${PIPESTATUS[0]}
@@ -705,6 +706,7 @@ if [[ "$@" == "build" ]] || [[ "$@" == "all" ]]; then
     
         echo "Using following command: mvn $extra -DargLine=\"$APP_PARAMETERS\" -fae -s $MAVEN_SETTINGS $clean install"
         echo "Maven version used: `mvn --version`"
+        echo "JAVA_HOME used: $JAVA_HOME"
         mvn $extra -DargLine="$APP_PARAMETERS" -fae -s $MAVEN_SETTINGS $clean install 2>&1 | tee -a $START_DIR/build.log
         # now get the exit status from mvn, and not that of tee which is what $? contains now
         MVN_EXIT_CODE=${PIPESTATUS[0]}
@@ -791,6 +793,7 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then
     cp -v $PROJECT_HOME/java/target/start $ACDIR/
     cp -v $PROJECT_HOME/java/target/stop $ACDIR/
     cp -v $PROJECT_HOME/java/target/status $ACDIR/
+    cp -v $PROJECT_HOME/java/target/configuration/JavaSE-11.profile $ACDIR/
 
     cp -v $PROJECT_HOME/java/target/refreshInstance.sh $ACDIR/
     cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/

configuration/installPluginsForEclipse2018-09.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # You need an installation of the Photon release of "Eclipse IDE for Eclipse Committers" matching you OS and JDK (32 vs 64 Bit):
-# https://www.eclipse.org/downloads/packages/release/2018-09
+# https://www.eclipse.org/downloads/packages/release/2018-09/r/eclipse-ide-eclipse-committers
 
 if [[ $1 == "" ]]; then
     echo "You need to specify the Eclipse installation directory"
@@ -56,9 +56,15 @@ updatePlugins http://download.eclipse.org/egit/updates org.eclipse.jgit.feature.
 # updatePlugins http://download.eclipse.org/mylyn/releases/latest org.eclipse.mylyn_feature.feature.group,org.eclipse.mylyn.bugzilla_feature.feature.group,org.eclipse.mylyn.builds.feature.group,org.eclipse.mylyn.commons.feature.group,org.eclipse.mylyn.commons.identity.feature.group,org.eclipse.mylyn.commons.notifications.feature.group,org.eclipse.mylyn.commons.repositories.feature.group,org.eclipse.mylyn.commons.repositories.http.feature.group,org.eclipse.mylyn.context_feature.feature.group,org.eclipse.mylyn.discovery.feature.group,org.eclipse.mylyn.gerrit.feature.feature.group,org.eclipse.mylyn.git.feature.group,org.eclipse.mylyn.hudson.feature.group,org.eclipse.mylyn.java_feature.feature.group,org.eclipse.mylyn.monitor.feature.group,org.eclipse.mylyn.reviews.feature.feature.group,org.eclipse.mylyn.team_feature.feature.group,org.eclipse.mylyn.versions.feature.group,org.eclipse.mylyn.wikitext_feature.feature.group
 
 echo "Installing SAP JVM Tools (profiler) ..."
-installPlugins https://tools.hana.ondemand.com/oxygen com.sap.jvm.profiling.feature.group
+installPlugins https://tools.hana.ondemand.com/photon com.sap.jvm.profiling.feature.group
 
 echo "Installing javax.xml.bind for news feed polling (see https://stackoverflow.com/questions/52528693/eclipse-internal-error-polling-news-feeds)..."
 installPlugins http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository javax.xml.bind
 
+echo "Installing Java 11 support"
+installPlugins http://download.eclipse.org/eclipse/updates/4.9-P-builds org.eclipse.jdt.java11patch.feature.group,org.eclipse.pde.java11patch.feature.group
+
+echo "Installing Java11 Patches..."
+installPlugins http://download.eclipse.org/eclipse/updates/4.9-P-builds/ org.eclipse.jdt.java11patch.feature.group
+
 echo "Installation completed!"

configuration/sailing.sh

@@ -8,6 +8,8 @@ export EC2_HOME=/opt/amazon/ec2-api-tools-1.6.8.0
 export EC2_URL=https://ec2.eu-west-1.amazonaws.com
 # SAP JVM
 export JAVA_HOME=/opt/sapjvm_8
+# JDK 11.0.1:
+#export JAVA_HOME=/opt/jdk-11.0.1+13
 #export JAVA_HOME=/opt/jdk1.8.0_45
 export JAVA_1_7_HOME=/opt/jdk1.7.0_75
 export ANDROID_HOME=/opt/android-sdk-linux

docker/.gitignore

@@ -0,0 +1,2 @@
+Dockerfile
+*.tar.gz

docker/Dockerfile.tpl

@@ -0,0 +1,24 @@
+FROM openjdk:11
+LABEL maintainer=axel.uhl@sap.com
+# Download and extract the release
+WORKDIR /home/sailing/servers/server
+RUN apt-get update \
+ && apt-get install -y wget \
+ && wget -O /tmp/RELEASE.tar.gz http://releases.sapsailing.com/RELEASE/RELEASE.tar.gz \
+ && tar xzvpf /tmp/RELEASE.tar.gz \
+ && rm /tmp/RELEASE.tar.gz
+RUN apt-get install -y vim
+COPY vimrc /root/.vimrc
+RUN apt-get install -y telnet dnsutils net-tools
+COPY env.sh .
+COPY start .
+COPY JavaSE-11.profile .
+# Workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910804
+RUN mkdir -p /docker-java-home/lib/jfr && \
+    wget https://hg.openjdk.java.net/jdk/jdk11/raw-file/76072a077ee1/src/jdk.jfr/share/conf/jfr/default.jfc \
+      -O /docker-java-home/lib/jfr/default.jfc && \
+    wget https://hg.openjdk.java.net/jdk/jdk11/raw-file/76072a077ee1/src/jdk.jfr/share/conf/jfr/profile.jfc \
+      -O /docker-java-home/lib/jfr/profile.jfc
+RUN echo "alias tailf=\"tail -f\"" >>/root/.bashrc
+EXPOSE 8888 14888 8000 7091 6666
+CMD [ "/home/sailing/servers/server/start", "fg" ]

docker/makeImageForLatestRelease

@@ -0,0 +1,19 @@
+#!/bin/bash
+release=$1
+if [ "$release" = "" ]; then
+  INDEX=`mktemp index_XXXX.html`
+  echo Tempfile for index.html is $INDEX
+  wget -O $INDEX http://releases.sapsailing.com/
+  release=$(cat $INDEX | grep build- | tail -1 | sed -e 's/^.*\(build-[0-9]*\).*$/\1/')
+  rm $INDEX
+  echo Latest release is $release
+fi
+GITROOT=`dirname $0`/..
+echo "Copying files from GITROOT $GITROOT into Docker workspace"
+cp "$GITROOT/java/target/env.sh" .
+cp "$GITROOT/java/target/start" .
+cp "$GITROOT/java/target/configuration/JavaSE-11.profile" .
+cat Dockerfile.tpl | sed -e "s/RELEASE/${release}/g" >Dockerfile
+docker build -t sapsailing:$release .
+echo "Cleaning up..."
+rm start env.sh JavaSE-11.profile Dockerfile

docker/mongo-statefulset.yaml

@@ -0,0 +1,71 @@
+#	Copyright 2016, Google, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongo
+  labels:
+    name: mongo
+spec:
+  ports:
+  - port: 27017
+    targetPort: 27017
+  clusterIP: None
+  selector:
+    role: mongo
+---
+apiVersion: apps/v1beta1
+kind: StatefulSet
+metadata:
+  name: mongo
+spec:
+  serviceName: "mongo"
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        role: mongo
+        environment: sailing
+    spec:
+      terminationGracePeriodSeconds: 10
+      containers:
+        - name: mongo
+          image: mongo
+          command:
+            - mongod
+            - "--replSet"
+            - rs0
+            - "--smallfiles"
+            - "--noprealloc"
+            - "--bind_ip"
+            - "0.0.0.0"
+          ports:
+            - containerPort: 27017
+          volumeMounts:
+            - name: mongo-persistent-storage
+              mountPath: /data/db
+        - name: mongo-sidecar
+          image: cvallance/mongo-k8s-sidecar
+          env:
+            - name: MONGO_SIDECAR_POD_LABELS
+              value: "role=mongo,environment=sailing"
+  volumeClaimTemplates:
+  - metadata:
+      name: mongo-persistent-storage
+    spec:
+      accessModes: [ "ReadWriteOnce" ]
+      storageClassName: "gp2"
+      resources:
+        requests:
+          storage: 1Gi

docker/nginx-pod.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nginx-liveness-pod
+spec:
+  containers:
+  - name: nginx
+    image: nginx:mainline
+    ports:
+    - containerPort: 80
+      name: http-port
+    livenessProbe:
+      httpGet:
+        path: /
+        port: http-port
+      initialDelaySeconds: 3
+      periodSeconds: 30

docker/sailing-pod.yaml

@@ -0,0 +1,24 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: sailing
+spec:
+  containers:
+  - name: sailing
+    image: donaldduck70/sapsailing:docker-201811291913
+    ports:
+    - containerPort: 8888
+      name: http-port
+    - containerPort: 14888
+      name: telnet-port
+    env:
+    - name: MONGODB_HOST
+      value: mongo-0.mongo
+    livenessProbe:
+      httpGet:
+        path: /
+        port: http-port
+      initialDelaySeconds: 10
+      periodSeconds: 30
+  imagePullSecrets:
+  - name: regcred

docker/vimrc

@@ -0,0 +1 @@
+set mouse-=a

java/com.sap.sailing.competitorimport/META-INF/MANIFEST.MF

@@ -8,5 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.sap.sailing.competitorimport
 Require-Bundle: com.sap.sse.common,
  com.sap.sailing.domain.shared.android,
- com.sap.sailing.domain.common
+ com.sap.sailing.domain.common,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Automatic-Module-Name: com.sap.sailing.competitorimport
+Import-Package: javax.xml.bind

java/com.sap.sailing.domain.deckmanadapter.test/META-INF/MANIFEST.MF

@@ -8,3 +8,5 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sap.sailing.domain.deckmanadapter
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.8.2"
+Import-Package: com.sun.istack;version="3.0.7",
+ javax.xml.bind

java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF

@@ -17,12 +17,15 @@ Require-Bundle: org.json.simple;bundle-version="1.1.0",
  com.sap.sailing.declination,
  com.sap.sse.common,
  com.sap.sse,
- com.sap.sse.security
+ com.sap.sse.security,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Import-Package: javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
  javax.ws.rs.ext;version="1.1.1",
+ javax.xml.bind,
  org.apache.commons.lang,
  org.codehaus.jackson.jaxrs;version="1.9.13",
+ org.eclipse.jetty.client;version="9.4.8",
  org.eclipse.jetty.io;version="9.4.8",
  org.eclipse.jetty.util.component;version="9.4.8",
  org.eclipse.jetty.util.ssl;version="9.4.8",
@@ -32,7 +35,6 @@ Import-Package: javax.ws.rs;version="1.1.1",
  org.eclipse.jetty.websocket.api.extensions;version="9.4.8",
  org.eclipse.jetty.websocket.client;version="9.4.8",
  org.eclipse.jetty.websocket.common;version="9.4.8",
- org.eclipse.jetty.client;version="9.4.8",
  org.osgi.framework;version="1.7.0"
 Web-ContextPath: /igtimi
 Bundle-Activator: com.sap.sailing.domain.igtimiadapter.impl.Activator

java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF

@@ -14,10 +14,12 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sse.common,
  com.sap.sse,
  com.sap.sailing.xrr.schema,
- com.sap.sailing.domain.shared.android
+ com.sap.sailing.domain.shared.android,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Export-Package: com.sap.sailing.domain.swisstimingadapter,
  com.sap.sailing.domain.swisstimingadapter.impl;x-friends:="com.sap.sailing.server.test,com.sap.sailing.mongodb.test,com.sap.sailing.domain.swisstimingadapter.persistence"
 Import-Package: com.sap.sailing.xrr.schema,
+ javax.xml.bind,
  org.osgi.framework
 Bundle-Activator: com.sap.sailing.domain.swisstimingadapter.impl.Activator
 Automatic-Module-Name: com.sap.sailing.domain.swisstimingadapter

java/com.sap.sailing.feature.runtime/feature.xml

@@ -160,4 +160,12 @@
          install-size="0"
          version="1.9.37"/>
 
+   <plugin
+         id="com.sap.sailing.routeconverterjava11extension"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java

@@ -29,6 +29,7 @@ import com.sap.sailing.gwt.ui.shared.settings.SailingSettingsConstants;
 import com.sap.sse.datamining.shared.DataMiningSession;
 import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.UUIDDataMiningSession;
+import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.ui.client.AnchorDataMiningSettingsControl;
 import com.sap.sse.datamining.ui.client.CompositeResultsPresenter;
 import com.sap.sse.datamining.ui.client.DataMiningService;
@@ -130,10 +131,10 @@ public class DataMiningEntryPoint extends AbstractSailingEntryPoint {
                             if (queryIdentifier.equals(json.get("uuid").isString().stringValue())) {
                                 String serializedQuery = json.get("payload").isString().stringValue();
                                 dataMiningService.getDeserializedQuery(serializedQuery,
-                                        new AsyncCallback<StatisticQueryDefinitionDTO>() {
+                                        new AsyncCallback<ModifiableStatisticQueryDefinitionDTO>() {
 
                                             @Override
-                                            public void onSuccess(StatisticQueryDefinitionDTO result) {
+                                            public void onSuccess(ModifiableStatisticQueryDefinitionDTO result) {
                                                 queryDefinitionProvider.applyQueryDefinition(result);
                                                 queryRunner.run(result);
                                             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StoredDataMiningQueryDataProvider.java

@@ -65,14 +65,15 @@ public class StoredDataMiningQueryDataProvider {
             update = false;
         }
 
-        dataMiningService.updateOrCreateStoredQuery(storedQuery, new AsyncCallback<StoredDataMiningQueryDTO>() {
+        dataMiningService.updateOrCreateStoredQuery((StoredDataMiningQueryDTOImpl) storedQuery,
+                new AsyncCallback<StoredDataMiningQueryDTOImpl>() {
             @Override
             public void onFailure(Throwable caught) {
                 GWT.log(caught.getMessage(), caught);
             }
 
             @Override
-            public void onSuccess(StoredDataMiningQueryDTO result) {
+            public void onSuccess(StoredDataMiningQueryDTOImpl result) {
                 queryDefinitions.remove(result);
                 queryDefinitions.add(result);
                 updateUi();
@@ -90,7 +91,8 @@ public class StoredDataMiningQueryDataProvider {
     public boolean removeQuery(String name) {
         Optional<StoredDataMiningQueryDTO> query = findByName(name);
         if (query.isPresent()) {
-            dataMiningService.removeStoredQuery(query.get(), new AsyncCallback<StoredDataMiningQueryDTO>() {
+            dataMiningService.removeStoredQuery((StoredDataMiningQueryDTOImpl) query.get(),
+                    new AsyncCallback<StoredDataMiningQueryDTOImpl>() {
 
                 @Override
                 public void onFailure(Throwable caught) {
@@ -98,7 +100,7 @@ public class StoredDataMiningQueryDataProvider {
                 }
 
                 @Override
-                public void onSuccess(StoredDataMiningQueryDTO result) {
+                        public void onSuccess(StoredDataMiningQueryDTOImpl result) {
                     queryDefinitions.remove(result);
                     updateUi();
                 }
@@ -141,9 +143,9 @@ public class StoredDataMiningQueryDataProvider {
 
     /** Refresh the stored queries and update the {@link StoredDataMiningQueryPanel}. */
     private void refreshQueries() {
-        dataMiningService.retrieveStoredQueries(new AsyncCallback<ArrayList<StoredDataMiningQueryDTO>>() {
+        dataMiningService.retrieveStoredQueries(new AsyncCallback<ArrayList<StoredDataMiningQueryDTOImpl>>() {
             @Override
-            public void onSuccess(ArrayList<StoredDataMiningQueryDTO> result) {
+            public void onSuccess(ArrayList<StoredDataMiningQueryDTOImpl> result) {
                 queryDefinitions.addAll(result);
                 updateUi();
             }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java

@@ -40,8 +40,6 @@ import com.sap.sse.datamining.shared.DataMiningSession;
 import com.sap.sse.datamining.shared.GroupKey;
 import com.sap.sse.datamining.shared.SerializationDummy;
 import com.sap.sse.datamining.shared.data.QueryResultState;
-import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO;
-import com.sap.sse.datamining.shared.dto.StoredDataMiningQueryDTO;
 import com.sap.sse.datamining.shared.impl.GenericGroupKey;
 import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier;
 import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO;
@@ -51,6 +49,7 @@ import com.sap.sse.datamining.shared.impl.dto.FunctionDTO;
 import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO;
 import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO;
+import com.sap.sse.datamining.shared.impl.dto.StoredDataMiningQueryDTOImpl;
 import com.sap.sse.datamining.ui.client.DataMiningService;
 import com.sap.sse.i18n.ResourceBundleStringMessages;
 import com.sap.sse.security.SecurityService;
@@ -354,7 +353,7 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
 
     @Override
     public <ResultType extends Serializable> QueryResultDTO<ResultType> runQuery(DataMiningSession session,
-            StatisticQueryDefinitionDTO queryDefinitionDTO) {
+            ModifiableStatisticQueryDefinitionDTO queryDefinitionDTO) {
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ,
                 queryDefinitionDTO.getDataRetrieverChainDefinition().getName()));
         DataMiningServer dataMiningServer = getDataMiningServer();
@@ -376,10 +375,12 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
     }
     
     @Override
-    public StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName) {
+    public ModifiableStatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier,
+            String localeInfoName) {
         SecurityUtils.getSubject().checkPermission(
                 Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ, identifier.getIdentifier()));
-        return localize(getDataMiningServer().getPredefinedQueryDefinitionDTO(identifier), localeInfoName);
+        return (ModifiableStatisticQueryDefinitionDTO) localize(
+                getDataMiningServer().getPredefinedQueryDefinitionDTO(identifier), localeInfoName);
     }
 
     @Override
@@ -398,13 +399,15 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
     }
     
     @Override
-    public StatisticQueryDefinitionDTO localize(StatisticQueryDefinitionDTO queryDefinitionDTO, String localeInfoName) {
+    public ModifiableStatisticQueryDefinitionDTO localize(ModifiableStatisticQueryDefinitionDTO queryDefinitionDTO,
+            String localeInfoName) {
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ,
                 queryDefinitionDTO.getDataRetrieverChainDefinition().getName()));
         DataMiningServer dataMiningServer = getDataMiningServer();
         StatisticQueryDefinition<?, ?, ?, ?> queryDefinition = dataMiningServer.getQueryDefinitionForDTO(queryDefinitionDTO);
         Locale locale = ResourceBundleStringMessages.Util.getLocaleFor(localeInfoName);
-        return dtoFactory.createQueryDefinitionDTO(queryDefinition, dataMiningServer.getStringMessages(), locale, localeInfoName);
+        return (ModifiableStatisticQueryDefinitionDTO) dtoFactory.createQueryDefinitionDTO(queryDefinition,
+                dataMiningServer.getStringMessages(), locale, localeInfoName);
     }
 
     @Override
@@ -413,26 +416,26 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
     }
 
     @Override
-    public ArrayList<StoredDataMiningQueryDTO> retrieveStoredQueries() {
+    public ArrayList<StoredDataMiningQueryDTOImpl> retrieveStoredQueries() {
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.READ));
         return storedDataMiningQueryPersistor.retrieveStoredQueries();
     }
 
     @Override
-    public StoredDataMiningQueryDTO updateOrCreateStoredQuery(StoredDataMiningQueryDTO query) {
+    public StoredDataMiningQueryDTOImpl updateOrCreateStoredQuery(StoredDataMiningQueryDTOImpl query) {
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.UPDATE));
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.CREATE));
-        return storedDataMiningQueryPersistor.updateOrCreateStoredQuery(query);
+        return (StoredDataMiningQueryDTOImpl) storedDataMiningQueryPersistor.updateOrCreateStoredQuery(query);
     }
 
     @Override
-    public StoredDataMiningQueryDTO removeStoredQuery(StoredDataMiningQueryDTO query) {
+    public StoredDataMiningQueryDTOImpl removeStoredQuery(StoredDataMiningQueryDTOImpl query) {
         SecurityUtils.getSubject().checkPermission(Permission.DATA_MINING.getStringPermissionForObjects(Mode.CREATE));
-        return storedDataMiningQueryPersistor.removeStoredQuery(query);
+        return (StoredDataMiningQueryDTOImpl) storedDataMiningQueryPersistor.removeStoredQuery(query);
     }
 
     @Override
-    public StatisticQueryDefinitionDTO getDeserializedQuery(String serializedQuery) {
-        return DataMiningQuerySerializer.fromBase64String(serializedQuery);
+    public ModifiableStatisticQueryDefinitionDTO getDeserializedQuery(String serializedQuery) {
+        return (ModifiableStatisticQueryDefinitionDTO) DataMiningQuerySerializer.fromBase64String(serializedQuery);
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StoredDataMiningQueryPersister.java

@@ -3,12 +3,13 @@ package com.sap.sailing.gwt.ui.server;
 import java.util.ArrayList;
 
 import com.sap.sse.datamining.shared.dto.StoredDataMiningQueryDTO;
+import com.sap.sse.datamining.shared.impl.dto.StoredDataMiningQueryDTOImpl;
 
 /** Instances of this class can load, update, create and remove stored data mining queries from the user store. */
 public interface StoredDataMiningQueryPersister {
 
     /** @return all {@link StoredDataMiningQueryDTO}s the user has stored in his user store. */
-    ArrayList<StoredDataMiningQueryDTO> retrieveStoredQueries();
+    ArrayList<StoredDataMiningQueryDTOImpl> retrieveStoredQueries();
 
     /** Updates or creates a new stored query and returns it. */
     StoredDataMiningQueryDTO updateOrCreateStoredQuery(StoredDataMiningQueryDTO query);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/StoredDataMiningQueryPersisterImpl.java

@@ -29,15 +29,18 @@ public class StoredDataMiningQueryPersisterImpl implements StoredDataMiningQuery
     }
 
     /** @return all {@link StoredDataMiningQueryDTO}s the user has stored in his user store. */
+    @SuppressWarnings("unchecked")
     @Override
-    public ArrayList<StoredDataMiningQueryDTO> retrieveStoredQueries() {
+    public ArrayList<StoredDataMiningQueryDTOImpl> retrieveStoredQueries() {
 
         StoredDataMiningQueryPreferences prefs = getPreferenceForCurrentUser(
                 SailingPreferences.STORED_DATAMINING_QUERY_PREFERENCES);
         if (prefs == null) {
             return new ArrayList<>();
         }
-        return new ArrayList<>(StreamSupport.stream(prefs.getStoredQueries().spliterator(), false).map(this::transform)
+        return new ArrayList<StoredDataMiningQueryDTOImpl>(
+                (Collection<? extends StoredDataMiningQueryDTOImpl>) StreamSupport
+                        .stream(prefs.getStoredQueries().spliterator(), false).map(this::transform)
                 .collect(Collectors.toList()));
     }
 

java/com.sap.sailing.manage2sail.resultimport/META-INF/MANIFEST.MF

@@ -6,7 +6,9 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: com.sap.sailing.manage2sail.resultimport.Activator
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.osgi.framework;version="1.5.0",
+Import-Package: com.sun.istack;version="3.0.7",
+ javax.xml.bind,
+ org.osgi.framework;version="1.5.0",
  org.osgi.util.tracker;version="1.5.1"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sailing.manage2sail,
@@ -17,5 +19,6 @@ Require-Bundle: com.sap.sailing.manage2sail,
  com.sap.sailing.xrr.schema,
  com.sap.sailing.domain.shared.android,
  com.sap.sailing.competitorimport,
- com.sap.sse
+ com.sap.sse,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Automatic-Module-Name: com.sap.sailing.manage2sail.resultimport

java/com.sap.sailing.media.persistence.test/src/com/sap/sailing/media/persistence/test/AbstractMongoDBTest.java

@@ -14,8 +14,8 @@ import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
 
 public abstract class AbstractMongoDBTest {
-    protected Mongo mongo;
-    protected DB db;
+    protected final Mongo mongo;
+    protected final DB db;
     private final MongoDBConfiguration dbConfiguration;
     private MongoDBService service;
     

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractMongoDBTest.java

@@ -18,13 +18,13 @@ public abstract class AbstractMongoDBTest {
     protected Mongo mongo;
     protected DB db;
     private final MongoDBConfiguration dbConfiguration;
-    private MongoDBService racingEventService;
+    private MongoDBService mongoDBService;
     
     public AbstractMongoDBTest() throws UnknownHostException, MongoException {
         dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
-        racingEventService = getDBConfiguration().getService();
+        mongoDBService = getDBConfiguration().getService();
         mongo = newMongo();
-        db = racingEventService.getDB();
+        db = mongoDBService.getDB();
     }
     
     protected MongoDBConfiguration getDBConfiguration() {
@@ -32,7 +32,7 @@ public abstract class AbstractMongoDBTest {
     }
     
     protected Mongo newMongo() throws UnknownHostException, MongoException {
-        return new MongoClient(dbConfiguration.getHostName(), dbConfiguration.getPort());
+        return new MongoClient(dbConfiguration.getMongoClientURI());
     }
     
     @Before
@@ -51,6 +51,6 @@ public abstract class AbstractMongoDBTest {
     }
 
     protected MongoDBService getMongoService() {
-        return racingEventService;
+        return mongoDBService;
     }
 }

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/MongoClientURITest.java

@@ -0,0 +1,29 @@
+package com.sap.sailing.mongodb.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+
+import com.mongodb.ReadPreference;
+import com.sap.sse.mongodb.MongoDBConfiguration;
+
+public class MongoClientURITest {
+    @Test
+    public void testDefaultConnectionOptions() {
+        MongoDBConfiguration config = new MongoDBConfiguration("mongodb://humba:12345/mydb");
+        assertEquals("humba", config.getHostname());
+        assertEquals(12345, config.getPort());
+        assertEquals("mydb", config.getDatabaseName());
+        assertSame(ReadPreference.primaryPreferred(), config.getMongoClientURI().getOptions().getReadPreference()); 
+    }
+
+    @Test
+    public void testSpecifigConnectionOptions() {
+        MongoDBConfiguration config = new MongoDBConfiguration("mongodb://humba:12345/mydb?replicaset=rs0&readpreference=primary");
+        assertEquals("humba", config.getHostname());
+        assertEquals(12345, config.getPort());
+        assertEquals("mydb", config.getDatabaseName());
+        assertSame(ReadPreference.primary(), config.getMongoClientURI().getOptions().getReadPreference()); 
+    }
+}

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java

@@ -66,16 +66,15 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive
     }
     
     private Mongo newMongo() throws UnknownHostException, MongoException {
-        return new MongoClient(dbConfiguration.getHostName(),
-                dbConfiguration.getPort());
+        return new MongoClient(dbConfiguration.getMongoClientURI());
     }
     
     @Before
     public void dropTestDB() throws UnknownHostException, MongoException {
         mongo = newMongo();
         assertNotNull(mongo);
-        mongo.dropDatabase(dbConfiguration.getDatabaseName());
-        db = mongo.getDB(dbConfiguration.getDatabaseName());
+        mongo.dropDatabase(dbConfiguration.getMongoClientURI().getDatabase());
+        db = mongo.getDB(dbConfiguration.getMongoClientURI().getDatabase());
         assertNotNull(db);
     }
     

java/com.sap.sailing.polars/META-INF/MANIFEST.MF

@@ -31,11 +31,13 @@ Require-Bundle:
  javax.servlet;bundle-version="2.6.0",
  org.apache.shiro.core;bundle-version="1.2.2",
  org.apache.shiro.web;bundle-version="1.2.2",
- org.apache.shiro.ehcache;bundle-version="1.2.3"
+ org.apache.shiro.ehcache;bundle-version="1.2.3",
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Import-Package: 
  com.sap.sailing.util,
  javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
+ javax.xml.bind,
  org.apache.http,
  org.apache.http.client;version="[4.2.6,4.3.0)",
  org.apache.http.client.methods;version="[4.2.6,4.3.0)",

java/com.sap.sailing.routeconverterjava11extension/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

java/com.sap.sailing.routeconverterjava11extension/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sailing.routeconverterjava11extension</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

java/com.sap.sailing.routeconverterjava11extension/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

java/com.sap.sailing.routeconverterjava11extension/.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

java/com.sap.sailing.routeconverterjava11extension/META-INF/MANIFEST.MF

@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Routeconverterjava11extension
+Bundle-SymbolicName: com.sap.sailing.routeconverterjava11extension
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Fragment-Host: routeconverter;bundle-version="2.12.2"
+Automatic-Module-Name: com.sap.sailing.routeconverterjava11extension
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: com.sun.istack,
+ com.sun.istack.localization,
+ com.sun.istack.logging,
+ javax.xml,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment,
+ javax.xml.bind.helpers,
+ javax.xml.bind.util,
+ javax.xml.datatype

java/com.sap.sailing.routeconverterjava11extension/build.properties

@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               .

java/com.sap.sailing.routeconverterjava11extension/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.routeconverterjava11extension</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF

@@ -11,7 +11,8 @@ Require-Bundle: javax.servlet;bundle-version="3.1.0",
  com.sap.sailing.server;bundle-version="1.0.0",
  com.sap.sse.mongodb;bundle-version="1.0.0",
  com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ org.mongodb.mongo-java-driver;bundle-version="2.13.0"
 Bundle-ClassPath: .
 Web-ContextPath: /sailingserver/test-support
 Import-Package: org.osgi.framework,

java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF

@@ -10,6 +10,9 @@ Import-Package: com.sap.sailing.server,
  javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
  javax.ws.rs.ext;version="1.1.1",
+ javax.xml.bind,
+ javax.xml.ws,
+ javax.xml.ws.http,
  org.apache.commons.lang,
  org.json.simple,
  org.json.simple.parser,
@@ -57,7 +60,8 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.grib,
  com.sap.sailing.nmeaconnector,
  com.sap.sailing.geocoding,
- com.googlecode.java-diff-utils
+ com.googlecode.java-diff-utils,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Bundle-ClassPath: .
 Web-ContextPath: /sailingserver
 Export-Package: com.sap.sailing.server.gateway,

java/com.sap.sailing.server.trackfiles.test/META-INF/MANIFEST.MF

@@ -17,6 +17,10 @@ Require-Bundle: com.tractrac.clientmodule;bundle-version="2.0.0",
  org.mockito.mockito-core;bundle-version="1.9.5",
  org.objenesis;bundle-version="1.3.0",
  com.sap.sse.common
-Import-Package: org.json.simple,
+Import-Package:  javax.xml.bind,
+ com.sun.istack,
+ com.sun.istack.localization,
+ com.sun.istack.logging,
+ org.json.simple,
  org.json.simple.parser
 Automatic-Module-Name: com.sap.sailing.server.trackfiles.test

java/com.sap.sailing.server.trackfiles/META-INF/MANIFEST.MF

@@ -14,7 +14,8 @@ Require-Bundle:
  com.sap.sailing.domain.common,
  routeconverter,
  com.sap.sse.common,
- com.sap.sse
+ com.sap.sse,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Import-Package: com.sap.sailing.domain.abstractlog,
  com.sap.sailing.domain.abstractlog.regatta.events,
  com.sap.sailing.domain.abstractlog.regatta.events.impl,

java/com.sap.sailing.server/SailingServer (No Proxy).launch

@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="com.sap.jvm.profiling.ui.widgets.allowDebugging" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/target"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<intAttribute key="default_start_level" value="4"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;com.google.gwt.eclipse.core.GWT_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<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="-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 -XX:+UseMembar -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=true"/>
-<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%"/>
-<stringAttribute key="profilingTraceType-IO_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
-<stringAttribute key="profilingTraceType-METHOD_PARAMETER_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
-<stringAttribute key="profilingTraceType-NETWORK_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_RESOLVE_ALL_HOSTS%CTX_KEY%true%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
-<stringAttribute key="profilingTraceType-PERFORMANCE_HOTSPOT_TRACE" value="KEY_IGNORE_SLEEPING_THREADS%CTX_KEY%false%CTX_ENTRY%KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%true%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
-<stringAttribute key="profilingTraceType-SYNCHRONIZATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.rabbitmq.client@default:default,com.sun.jersey.contribs.jersey-multipart@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,jcl.over.slf4j@default:default,lz4-java@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.aws-java-sdk@default:default,org.apache.servicemix.bundles.ehcache@default:default,org.apache.servicemix.bundles.scribe@default:default,org.apache.servicemix.bundles.zxing@default:default,org.apache.shiro.core@default:default,org.apache.shiro.ehcache@default:default,org.apache.shiro.web@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@3:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hyperic.sigar@default:default,org.jdom@default:default,org.jvnet.mimepull@default:default,org.mongodb.mongo-java-driver@default:default,org.objectweb.asm@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<stringAttribute key="workspace_bundles" value="com.google.gwt.servlet@default:default,com.googlecode.java-diff-utils@default:default,com.googlecode.mgwt@default:default,com.sap.sailing.barbados.resultimport@default:default,com.sap.sailing.competitorimport@default:default,com.sap.sailing.dashboards.gwt@5:true,com.sap.sailing.datamining.provider@default:default,com.sap.sailing.datamining.shared@default:default,com.sap.sailing.datamining@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.deckmanadapter@4:true,com.sap.sailing.domain.expeditionadapter@4:true,com.sap.sailing.domain.igtimiadapter.persistence@default:default,com.sap.sailing.domain.igtimiadapter@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.racelogtrackingadapter@3:default,com.sap.sailing.domain.shared.android@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@4:true,com.sap.sailing.domain.swisstimingreplayadapter@4:true,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@4:true,com.sap.sailing.domain.windfinderadapter@4:true,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector.common@default:default,com.sap.sailing.expeditionconnector.persistence@3:true,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.grib@default:default,com.sap.sailing.gwt.ui@5:true,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.manage2sail.resultimport@default:default,com.sap.sailing.manage2sail@default:default,com.sap.sailing.monitoring@default:default,com.sap.sailing.news@default:default,com.sap.sailing.nmeaconnector@default:default,com.sap.sailing.polars.datamining.shared@default:default,com.sap.sailing.polars.datamining@default:default,com.sap.sailing.polars@4:true,com.sap.sailing.resultimport@default:default,com.sap.sailing.sailwave.resultimport@default:default,com.sap.sailing.server.gateway.serialization.shared.android@default:default,com.sap.sailing.server.gateway.serialization@default:default,com.sap.sailing.server.gateway@5:true,com.sap.sailing.server.trackfiles@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.velum.resultimport@default:default,com.sap.sailing.www@4:true,com.sap.sailing.xrr.resultimport@default:default,com.sap.sailing.xrr.schema@default:default,com.sap.sailing.xrr.structureimport@default:default,com.sap.sailing.yachtscoring.resultimport@default:default,com.sap.sse.common@default:default,com.sap.sse.datamining.annotations@default:default,com.sap.sse.datamining.shared@default:default,com.sap.sse.datamining.ui@default:default,com.sap.sse.datamining@default:default,com.sap.sse.filestorage@default:default,com.sap.sse.gwt.adminconsole@default:default,com.sap.sse.gwt@default:default,com.sap.sse.mail@4:true,com.sap.sse.mongodb@default:default,com.sap.sse.operationaltransformation@default:default,com.sap.sse.replication@4:true,com.sap.sse.security.common@default:default,com.sap.sse.security.ui@6:true,com.sap.sse.security.userstore.mongodb@4:true,com.sap.sse.security@5:true,com.sap.sse.shared.android@default:default,com.sap.sse@default:default,com.tractrac.clientmodule@default:default,net.sf.marineapi@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default,org.mp4parser.isoparser@default:default"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="false"/>
+    <booleanAttribute key="com.sap.jvm.profiling.ui.widgets.allowDebugging" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/target"/>
+    <booleanAttribute key="default" value="true"/>
+    <booleanAttribute key="default_auto_start" value="true"/>
+    <intAttribute key="default_start_level" value="4"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;com.google.gwt.eclipse.core.GWT_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <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="-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 -XX:+UseMembar -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=true"/>
+    <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%"/>
+    <stringAttribute key="profilingTraceType-IO_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-METHOD_PARAMETER_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-NETWORK_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_RESOLVE_ALL_HOSTS%CTX_KEY%true%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-PERFORMANCE_HOTSPOT_TRACE" value="KEY_IGNORE_SLEEPING_THREADS%CTX_KEY%false%CTX_ENTRY%KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%true%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-SYNCHRONIZATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="target_bundles" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.rabbitmq.client@default:default,com.sun.activation.javax.activation@default:default,com.sun.istack.commons-runtime@default:default,com.sun.jersey.contribs.jersey-multipart@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,com.sun.xml.bind.jaxb-impl@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,jaxb-api@default:default,jcl.over.slf4j@default:default,lz4-java@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.aws-java-sdk@default:default,org.apache.servicemix.bundles.ehcache@default:default,org.apache.servicemix.bundles.scribe@default:default,org.apache.servicemix.bundles.zxing@default:default,org.apache.shiro.core@default:default,org.apache.shiro.ehcache@default:default,org.apache.shiro.web@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot.warurl@default:default,org.eclipse.jetty.osgi.boot@3:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hyperic.sigar@default:default,org.jdom@default:default,org.jvnet.mimepull@default:default,org.mongodb.mongo-java-driver@default:default,org.objectweb.asm@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <stringAttribute key="workspace_bundles" value="com.google.gwt.servlet@default:default,com.googlecode.java-diff-utils@default:default,com.googlecode.mgwt@default:default,com.sap.sailing.barbados.resultimport@default:default,com.sap.sailing.competitorimport@default:default,com.sap.sailing.dashboards.gwt@5:true,com.sap.sailing.datamining.provider@default:default,com.sap.sailing.datamining.shared@default:default,com.sap.sailing.datamining@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.deckmanadapter@4:true,com.sap.sailing.domain.expeditionadapter@4:true,com.sap.sailing.domain.igtimiadapter.persistence@default:default,com.sap.sailing.domain.igtimiadapter@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.racelogtrackingadapter@3:default,com.sap.sailing.domain.shared.android@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@4:true,com.sap.sailing.domain.swisstimingreplayadapter@4:true,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@4:true,com.sap.sailing.domain.windfinderadapter@4:true,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector.common@default:default,com.sap.sailing.expeditionconnector.persistence@3:true,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.grib@default:default,com.sap.sailing.gwt.ui@5:true,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.manage2sail.resultimport@default:default,com.sap.sailing.manage2sail@default:default,com.sap.sailing.monitoring@default:default,com.sap.sailing.news@default:default,com.sap.sailing.nmeaconnector@default:default,com.sap.sailing.polars.datamining.shared@default:default,com.sap.sailing.polars.datamining@default:default,com.sap.sailing.polars@4:true,com.sap.sailing.resultimport@default:default,com.sap.sailing.routeconverterjava11extension@default:false,com.sap.sailing.sailwave.resultimport@default:default,com.sap.sailing.server.gateway.serialization.shared.android@default:default,com.sap.sailing.server.gateway.serialization@default:default,com.sap.sailing.server.gateway@5:true,com.sap.sailing.server.trackfiles@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.velum.resultimport@default:default,com.sap.sailing.www@4:true,com.sap.sailing.xmlexport@default:default,com.sap.sailing.xrr.resultimport@default:default,com.sap.sailing.xrr.schema@default:default,com.sap.sailing.xrr.structureimport@default:default,com.sap.sailing.yachtscoring.resultimport@default:default,com.sap.sse.common@default:default,com.sap.sse.datamining.annotations@default:default,com.sap.sse.datamining.shared@default:default,com.sap.sse.datamining.ui@default:default,com.sap.sse.datamining@default:default,com.sap.sse.filestorage@default:default,com.sap.sse.gwt.adminconsole@default:default,com.sap.sse.gwt@default:default,com.sap.sse.jersey.jaxbdependencyfragment@default:false,com.sap.sse.mail@4:true,com.sap.sse.mongodb@default:default,com.sap.sse.operationaltransformation@default:default,com.sap.sse.replication@4:true,com.sap.sse.security.common@default:default,com.sap.sse.security.ui@6:true,com.sap.sse.security.userstore.mongodb@4:true,com.sap.sse.security@5:true,com.sap.sse.shared.android@default:default,com.sap.sse@default:default,com.tractrac.clientmodule@default:default,net.sf.marineapi@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default,org.mp4parser.isoparser@default:default"/>
 </launchConfiguration>

java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="automaticAdd" value="false"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="false"/>
+    <booleanAttribute key="com.sap.jvm.profiling.ui.widgets.allowDebugging" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/target"/>
+    <booleanAttribute key="default" value="true"/>
+    <booleanAttribute key="default_auto_start" value="true"/>
+    <intAttribute key="default_start_level" value="4"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
+    <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;com.google.gwt.eclipse.core.GWT_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+    <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="-ea -Dosgi.java.profile=file:///${project_loc:java}/target/configuration/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -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 -Drestore.tracked.races=false"/>
+    <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%"/>
+    <stringAttribute key="profilingTraceType-IO_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-METHOD_PARAMETER_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-NETWORK_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_RESOLVE_ALL_HOSTS%CTX_KEY%true%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-PERFORMANCE_HOTSPOT_TRACE" value="KEY_IGNORE_SLEEPING_THREADS%CTX_KEY%false%CTX_ENTRY%KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%true%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <stringAttribute key="profilingTraceType-SYNCHRONIZATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="target_bundles" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.rabbitmq.client@default:default,com.sun.activation.javax.activation@default:default,com.sun.istack.commons-runtime@default:default,com.sun.jersey.contribs.jersey-multipart@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,com.sun.xml.bind.jaxb-impl@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,jaxb-api@default:default,jcl.over.slf4j@default:default,lz4-java@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.aws-java-sdk@default:default,org.apache.servicemix.bundles.ehcache@default:default,org.apache.servicemix.bundles.scribe@default:default,org.apache.servicemix.bundles.zxing@default:default,org.apache.shiro.core@default:default,org.apache.shiro.ehcache@default:default,org.apache.shiro.web@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@3:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hyperic.sigar@default:default,org.jdom@default:default,org.jvnet.mimepull@default:default,org.mongodb.mongo-java-driver@default:default,org.objectweb.asm@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <stringAttribute key="workspace_bundles" value="com.google.gwt.servlet@default:default,com.googlecode.java-diff-utils@default:default,com.googlecode.mgwt@default:default,com.sap.sailing.barbados.resultimport@default:default,com.sap.sailing.competitorimport@default:default,com.sap.sailing.dashboards.gwt@5:true,com.sap.sailing.datamining.provider@default:default,com.sap.sailing.datamining.shared@default:default,com.sap.sailing.datamining@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.deckmanadapter@4:true,com.sap.sailing.domain.expeditionadapter@4:true,com.sap.sailing.domain.igtimiadapter.persistence@default:default,com.sap.sailing.domain.igtimiadapter@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.racelogtrackingadapter@3:default,com.sap.sailing.domain.shared.android@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@4:true,com.sap.sailing.domain.swisstimingreplayadapter@4:true,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@4:true,com.sap.sailing.domain.windfinderadapter@4:true,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector.common@default:default,com.sap.sailing.expeditionconnector.persistence@3:true,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.grib@default:default,com.sap.sailing.gwt.ui@5:true,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.manage2sail.resultimport@default:default,com.sap.sailing.manage2sail@default:default,com.sap.sailing.monitoring@default:default,com.sap.sailing.news@default:default,com.sap.sailing.nmeaconnector@default:default,com.sap.sailing.polars.datamining.shared@default:default,com.sap.sailing.polars.datamining@default:default,com.sap.sailing.polars@4:true,com.sap.sailing.resultimport@default:default,com.sap.sailing.routeconverterjava11extension@default:false,com.sap.sailing.sailwave.resultimport@default:default,com.sap.sailing.server.gateway.serialization.shared.android@default:default,com.sap.sailing.server.gateway.serialization@default:default,com.sap.sailing.server.gateway@5:true,com.sap.sailing.server.trackfiles@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.velum.resultimport@default:default,com.sap.sailing.www@4:true,com.sap.sailing.xrr.resultimport@default:default,com.sap.sailing.xrr.schema@default:default,com.sap.sailing.xrr.structureimport@default:default,com.sap.sailing.yachtscoring.resultimport@default:default,com.sap.sse.common@default:default,com.sap.sse.datamining.annotations@default:default,com.sap.sse.datamining.shared@default:default,com.sap.sse.datamining.ui@default:default,com.sap.sse.datamining@default:default,com.sap.sse.filestorage@default:default,com.sap.sse.gwt.adminconsole@default:default,com.sap.sse.gwt@default:default,com.sap.sse.jersey.jaxbdependencyfragment@default:false,com.sap.sse.mail@4:true,com.sap.sse.mongodb@default:default,com.sap.sse.operationaltransformation@default:default,com.sap.sse.replication@4:true,com.sap.sse.security.common@default:default,com.sap.sse.security.ui@6:true,com.sap.sse.security.userstore.mongodb@4:true,com.sap.sse.security@5:true,com.sap.sse.shared.android@default:default,com.sap.sse@default:default,com.tractrac.clientmodule@default:default,net.sf.marineapi@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default,org.mp4parser.isoparser@default:default"/>
+</launchConfiguration>

java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml

@@ -68,13 +68,6 @@
          version="1.6.4.1"
          unpack="false"/>
 
-   <plugin
-         id="routeconverter"
-         download-size="0"
-         install-size="0"
-         version="2.12.2.201406032322"
-         unpack="false"/>
-
    <plugin
          id="org.apache.felix.shell"
          download-size="0"
@@ -124,4 +117,39 @@
          version="3.1.0.1"
          unpack="false"/>
 
+   <plugin
+         id="jaxb-api"
+         download-size="0"
+         install-size="0"
+         version="2.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.xml.bind.jaxb-impl"
+         download-size="0"
+         install-size="0"
+         version="2.3.1"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.activation.javax.activation"
+         download-size="0"
+         install-size="0"
+         version="1.2.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.istack.commons-runtime"
+         download-size="0"
+         install-size="0"
+         version="3.0.7"
+         unpack="false"/>
+
+   <plugin
+         id="routeconverter"
+         download-size="0"
+         install-size="0"
+         version="2.12.2.201406032322"
+         unpack="false"/>
+
 </feature>

java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target

@@ -1,54 +1,94 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="114">
+<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="148">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
-<repository location="https://p2.sapsailing.com/p2/sailing/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.osgi" version="3.10.2.v20150203-1939"/>
-<unit id="org.eclipse.osgi.source" version="3.10.2.v20150203-1939"/>
-<unit id="org.eclipse.osgi.services" version="3.4.0.v20140312-2051"/>
-<unit id="org.eclipse.osgi.services.source" version="3.4.0.v20140312-2051"/>
-<unit id="org.eclipse.equinox.common" version="3.6.200.v20130402-1505"/>
-<unit id="org.eclipse.equinox.common.source" version="3.6.200.v20130402-1505"/>
-<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
-<unit id="org.eclipse.equinox.util.source" version="1.0.500.v20130404-1337"/>
-<unit id="org.eclipse.equinox.simpleconfigurator" version="1.1.0.v20131217-1203"/>
-<unit id="org.eclipse.equinox.simpleconfigurator.source" version="1.1.0.v20131217-1203"/>
-<unit id="org.eclipse.equinox.console" version="1.1.0.v20140131-1639"/>
-<unit id="org.eclipse.equinox.console.source" version="1.1.0.v20140131-1639"/>
-<unit id="org.eclipse.equinox.launcher" version="1.3.0.v20140415-2008"/>
-<unit id="org.eclipse.equinox.launcher.source" version="1.3.0.v20140415-2008"/>
-<unit id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/>
-<unit id="org.apache.felix.gogo.command.source" version="0.10.0.v201209301215"/>
-<unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>
-<unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/>
-<unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
-<unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
-<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
-<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
 <unit id="javax.ws.rs.source" version="1.1.1.v20130318-1750"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
+<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
+<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.8.201802270002"/>
+<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/>
+<unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>
+<unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
+<unit id="org.eclipse.equinox.app" version="1.3.400.v20150715-1528"/>
+<unit id="org.eclipse.equinox.cm" version="1.2.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.common" version="3.9.0.v20170207-1454"/>
+<unit id="org.eclipse.equinox.concurrent" version="1.1.0.v20130327-1442"/>
+<unit id="org.eclipse.equinox.console" version="1.1.300.v20170512-2111"/>
+<unit id="org.eclipse.equinox.coordinator" version="1.3.300.v20170512-2111"/>
+<unit id="org.eclipse.equinox.device" version="1.0.400.v20130327-1442"/>
+<unit id="org.eclipse.equinox.ds" version="1.5.0.v20170307-1429"/>
+<unit id="org.eclipse.equinox.event" version="1.4.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.http.jetty" version="3.4.0.v20170503-2025"/>
+<unit id="org.eclipse.equinox.http.registry" version="1.1.400.v20150715-1528"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.io" version="1.1.100.v20150430-1834"/>
+<unit id="org.eclipse.equinox.ip" version="1.1.400.v20161007-1324"/>
+<unit id="org.eclipse.equinox.jsp.jasper" version="1.0.500.v20150119-1358"/>
+<unit id="org.eclipse.equinox.jsp.jasper.registry" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.launcher" version="1.4.0.v20161219-1356"/>
+<unit id="org.eclipse.equinox.metatype" version="1.4.300.v20170105-1446"/>
+<unit id="org.eclipse.equinox.preferences" version="3.7.0.v20170126-2132"/>
+<unit id="org.eclipse.equinox.region" version="1.4.0.v20170117-1425"/>
+<unit id="org.eclipse.equinox.registry" version="3.7.0.v20170222-1344"/>
+<unit id="org.eclipse.equinox.servletbridge" version="1.3.200.v20160128-1435"/>
+<unit id="org.eclipse.equinox.simpleconfigurator" version="1.2.1.v20180131-1435"/>
+<unit id="org.eclipse.equinox.supplement" version="1.7.0.v20170329-1416"/>
+<unit id="org.eclipse.equinox.transforms.hook" version="1.2.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.transforms.xslt" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.useradmin" version="1.1.400.v20130327-1442"/>
+<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
+<unit id="org.eclipse.equinox.wireadmin" version="1.0.600.v20150715-1528"/>
+<unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.osgi" version="3.12.100.v20180210-1608"/>
+<unit id="org.eclipse.osgi.services" version="3.6.0.v20170228-1906"/>
+<unit id="org.eclipse.osgi.util" version="3.4.0.v20170111-1608"/>
+<repository location="http://download.eclipse.org/releases/oxygen/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.5.0.v201504151636"/>
+<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
+<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
+<unit id="javax.servlet" version="3.1.0.v201410161800"/>
+<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
+<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
+<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
+<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
+<unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
+<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+<unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
+<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
+<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
+<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
+<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
+<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
+<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
 <unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/>
 <unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/>
 <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
@@ -56,39 +96,28 @@
 <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
-<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
-<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
-<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
-<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
-<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
-<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
-<unit id="org.jdom" version="1.1.1.v201101151400"/>
-<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
-<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
-<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
-<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
-<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
-<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
-<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
 <unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
 <unit id="org.apache.httpcomponents.httpclient.source" version="4.2.6.v201311072007"/>
 <unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
 <unit id="org.apache.httpcomponents.httpcore.source" version="4.2.5.v201311072007"/>
-<unit id="javax.servlet" version="3.1.0.v201410161800"/>
-<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
-<unit id="org.dom4j" version="1.6.1.v201312101416"/>
-<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
 <unit id="org.apache.poi" version="3.9.0.v201405241750"/>
 <unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
 <unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
-<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/>
-<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.5.0.v201504151636"/>
+<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
+<unit id="org.dom4j" version="1.6.1.v201312101416"/>
+<unit id="org.jdom" version="1.1.1.v201101151400"/>
+<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
+<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
+<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.8.201802270002"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
+<repository location="https://p2.sapsailing.com/p2/sailing/"/>
 </location>
 </locations>
 <includeBundles>
@@ -96,10 +125,13 @@
 <plugin id="com.fasterxml.jackson.core.jackson-core"/>
 <plugin id="com.fasterxml.jackson.core.jackson-databind"/>
 <plugin id="com.rabbitmq.client"/>
+<plugin id="com.sun.activation.javax.activation"/>
+<plugin id="com.sun.istack.commons-runtime"/>
 <plugin id="com.sun.jersey"/>
 <plugin id="com.sun.jersey.contribs.jersey-multipart"/>
 <plugin id="com.sun.jersey.source"/>
 <plugin id="com.sun.mail.javax.mail"/>
+<plugin id="com.sun.xml.bind.jaxb-impl"/>
 <plugin id="jackson-core-asl"/>
 <plugin id="jackson-jaxrs"/>
 <plugin id="jackson-mapper-asl"/>
@@ -111,10 +143,14 @@
 <plugin id="javax.validation.source"/>
 <plugin id="javax.ws.rs"/>
 <plugin id="javax.ws.rs.source"/>
+<plugin id="javax.xml"/>
+<plugin id="jaxb-api"/>
+<plugin id="javax.xml.stream"/>
+<plugin id="javax.xml.ws"/>
 <plugin id="jcl.over.slf4j"/>
 <plugin id="jul.to.slf4j"/>
 <plugin id="lz4-java"/>
-<plugin id="org.apache.commons.beanutils"/>
+<plugin id="org.apache.commons.beanutils" version="1.9.0"/>
 <plugin id="org.apache.commons.beanutils.source"/>
 <plugin id="org.apache.commons.codec"/>
 <plugin id="org.apache.commons.collections"/>
@@ -151,6 +187,8 @@
 <plugin id="org.apache.xmlbeans"/>
 <plugin id="org.codehaus.jettison.jettison"/>
 <plugin id="org.dom4j"/>
+<plugin id="org.eclipse.equinox.cm"/>
+<plugin id="org.eclipse.equinox.cm.source"/>
 <plugin id="org.eclipse.equinox.common"/>
 <plugin id="org.eclipse.equinox.common.source"/>
 <plugin id="org.eclipse.equinox.console"/>
@@ -167,10 +205,10 @@
 <plugin id="org.eclipse.jetty.client.source"/>
 <plugin id="org.eclipse.jetty.deploy"/>
 <plugin id="org.eclipse.jetty.deploy.source"/>
-<plugin id="org.eclipse.jetty.http"/>
-<plugin id="org.eclipse.jetty.http.source"/>
-<plugin id="org.eclipse.jetty.io"/>
-<plugin id="org.eclipse.jetty.io.source"/>
+<plugin id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.jaas"/>
 <plugin id="org.eclipse.jetty.jmx"/>
 <plugin id="org.eclipse.jetty.jmx.source"/>
@@ -181,17 +219,17 @@
 <plugin id="org.eclipse.jetty.proxy"/>
 <plugin id="org.eclipse.jetty.rewrite"/>
 <plugin id="org.eclipse.jetty.rewrite.source"/>
-<plugin id="org.eclipse.jetty.security"/>
-<plugin id="org.eclipse.jetty.security.source"/>
-<plugin id="org.eclipse.jetty.server"/>
-<plugin id="org.eclipse.jetty.server.source"/>
-<plugin id="org.eclipse.jetty.servlet"/>
-<plugin id="org.eclipse.jetty.servlet.source"/>
+<plugin id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.servlets.source"/>
-<plugin id="org.eclipse.jetty.util"/>
+<plugin id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.util.ajax"/>
 <plugin id="org.eclipse.jetty.util.ajax.source"/>
-<plugin id="org.eclipse.jetty.util.source"/>
+<plugin id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.webapp"/>
 <plugin id="org.eclipse.jetty.webapp.source"/>
 <plugin id="org.eclipse.jetty.websocket.api"/>
@@ -206,6 +244,8 @@
 <plugin id="org.eclipse.osgi.services"/>
 <plugin id="org.eclipse.osgi.services.source"/>
 <plugin id="org.eclipse.osgi.source"/>
+<plugin id="org.eclipse.osgi.util"/>
+<plugin id="org.eclipse.osgi.util.source"/>
 <plugin id="org.hamcrest"/>
 <plugin id="org.hamcrest.core"/>
 <plugin id="org.hamcrest.integration"/>
@@ -214,8 +254,8 @@
 <plugin id="org.hyperic.sigar"/>
 <plugin id="org.jdom"/>
 <plugin id="org.jdom.source"/>
-<plugin id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
-<plugin id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
+<plugin id="org.junit"/>
+<plugin id="org.junit.source"/>
 <plugin id="org.jvnet.mimepull"/>
 <plugin id="org.mockito.mockito-core"/>
 <plugin id="org.mongodb.mongo-java-driver"/>

java/com.sap.sailing.xrr.resultimport/META-INF/MANIFEST.MF

@@ -12,11 +12,14 @@ Import-Package: com.sap.sailing.server,
  com.sap.sailing.server.impl,
  com.sap.sailing.server.operationaltransformation,
  com.sap.sailing.xrr.schema,
+ com.sun.istack;version="3.0.7",
+ javax.xml.bind,
  org.json.simple,
  org.json.simple.parser,
  org.osgi.framework;version="1.6.0"
 Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.common,
  com.sap.sailing.resultimport,
- com.sap.sse.common
+ com.sap.sse.common,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator

java/com.sap.sailing.xrr.schema/META-INF/MANIFEST.MF

@@ -9,6 +9,12 @@ Export-Package: com.sap.sailing.xrr.schema
 Import-Package: com.sap.sailing.server,
  com.sap.sailing.server.impl,
  com.sap.sailing.server.operationaltransformation,
+ com.sun.istack;version="3.0.7",
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment,
+ javax.xml.bind.util,
  org.json.simple,
  org.json.simple.parser,
  org.osgi.framework;version="1.6.0"

java/com.sap.sailing.xrr.structureimport/META-INF/MANIFEST.MF

@@ -17,9 +17,11 @@ Require-Bundle: com.google.gwt.user;bundle-version="2.8.2";resolution:=optional,
  com.sap.sailing.xrr.resultimport;bundle-version="1.0.0",
  com.sap.sse.common;bundle-version="1.0.0",
  com.sap.sailing.resultimport;bundle-version="1.0.0",
- com.sap.sse
+ com.sap.sse,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Import-Package: com.sap.sailing.server.operationaltransformation,
  com.sap.sailing.xrr.schema,
+ javax.xml.bind,
  org.json.simple,
  org.json.simple.parser,
  org.osgi.framework;version="1.7.0"

java/com.sap.sailing.yachtscoring.resultimport/META-INF/MANIFEST.MF

@@ -6,12 +6,15 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: com.sap.sailing.yachtscoring.resultimport.Activator
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.osgi.framework;version="1.5.0",
+Import-Package: com.sun.istack;version="3.0.7",
+ javax.xml.bind,
+ org.osgi.framework;version="1.5.0",
  org.osgi.util.tracker;version="1.5.1"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sailing.domain.common,
  com.sap.sailing.resultimport,
  com.sap.sailing.xrr.resultimport,
  com.sap.sse.common,
- com.sap.sailing.xrr.schema
+ com.sap.sailing.xrr.schema,
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
 Automatic-Module-Name: com.sap.sailing.yachtscoring.resultimport

java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/dto/StoredDataMiningQueryDTOImpl.java

@@ -14,7 +14,7 @@ public class StoredDataMiningQueryDTOImpl implements StoredDataMiningQueryDTO {
 
     private UUID id;
 
-    private StatisticQueryDefinitionDTO query;
+    private ModifiableStatisticQueryDefinitionDTO query;
 
     public StoredDataMiningQueryDTOImpl() {
     }
@@ -22,7 +22,7 @@ public class StoredDataMiningQueryDTOImpl implements StoredDataMiningQueryDTO {
     public StoredDataMiningQueryDTOImpl(String name, UUID id, StatisticQueryDefinitionDTO query) {
         this.name = name;
         this.id = id;
-        this.query = query;
+        this.query = (ModifiableStatisticQueryDefinitionDTO) query;
     }
 
     @Override
@@ -48,7 +48,7 @@ public class StoredDataMiningQueryDTOImpl implements StoredDataMiningQueryDTO {
     }
 
     public void setSerializedQuery(StatisticQueryDefinitionDTO query) {
-        this.query = query;
+        this.query = (ModifiableStatisticQueryDefinitionDTO) query;
     }
 
     @Override

java/com.sap.sse.datamining.ui.test/.classpath

@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningService.java

@@ -10,15 +10,15 @@ import com.google.gwt.user.client.rpc.RemoteService;
 import com.sap.sse.common.settings.SerializableSettings;
 import com.sap.sse.datamining.shared.DataMiningSession;
 import com.sap.sse.datamining.shared.SerializationDummy;
-import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO;
-import com.sap.sse.datamining.shared.dto.StoredDataMiningQueryDTO;
 import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier;
 import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO;
 import com.sap.sse.datamining.shared.impl.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO;
 import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO;
+import com.sap.sse.datamining.shared.impl.dto.StoredDataMiningQueryDTOImpl;
 
 public interface DataMiningService extends RemoteService {
 
@@ -53,24 +53,26 @@ public interface DataMiningService extends RemoteService {
             String localeInfoName);
 
     <ResultType extends Serializable> QueryResultDTO<ResultType> runQuery(DataMiningSession session,
-            StatisticQueryDefinitionDTO queryDefinition);
+            ModifiableStatisticQueryDefinitionDTO queryDefinition);
 
     HashSet<PredefinedQueryIdentifier> getPredefinedQueryIdentifiers();
     
-    StatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName);
+    ModifiableStatisticQueryDefinitionDTO getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier,
+            String localeInfoName);
 
     <ResultType extends Serializable> QueryResultDTO<ResultType> runPredefinedQuery(DataMiningSession session,
             PredefinedQueryIdentifier identifier, String localeInfoName);
     
-    StatisticQueryDefinitionDTO localize(StatisticQueryDefinitionDTO queryDefinition, String localeInfoName);
+    ModifiableStatisticQueryDefinitionDTO localize(ModifiableStatisticQueryDefinitionDTO queryDefinition,
+            String localeInfoName);
 
     SerializationDummy pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy();
 
-    ArrayList<StoredDataMiningQueryDTO> retrieveStoredQueries();
+    ArrayList<StoredDataMiningQueryDTOImpl> retrieveStoredQueries();
 
-    StoredDataMiningQueryDTO updateOrCreateStoredQuery(StoredDataMiningQueryDTO query);
+    StoredDataMiningQueryDTOImpl updateOrCreateStoredQuery(StoredDataMiningQueryDTOImpl query);
 
-    StoredDataMiningQueryDTO removeStoredQuery(StoredDataMiningQueryDTO query);
+    StoredDataMiningQueryDTOImpl removeStoredQuery(StoredDataMiningQueryDTOImpl query);
 
-    StatisticQueryDefinitionDTO getDeserializedQuery(String serializedQuery);
+    ModifiableStatisticQueryDefinitionDTO getDeserializedQuery(String serializedQuery);
 }

java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java

@@ -18,8 +18,10 @@ import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.DataRetrieverChainDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.DataRetrieverLevelDTO;
 import com.sap.sse.datamining.shared.impl.dto.FunctionDTO;
+import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO;
 import com.sap.sse.datamining.shared.impl.dto.ReducedDimensionsDTO;
+import com.sap.sse.datamining.shared.impl.dto.StoredDataMiningQueryDTOImpl;
 
 public interface DataMiningServiceAsync {
 
@@ -57,19 +59,19 @@ public interface DataMiningServiceAsync {
             String localeInfoName, AsyncCallback<QueryResultDTO<HashSet<Object>>> callback);
 
     <ResultType extends Serializable> void runQuery(DataMiningSession session,
-            StatisticQueryDefinitionDTO queryDefinition, AsyncCallback<QueryResultDTO<ResultType>> callback);
+            ModifiableStatisticQueryDefinitionDTO queryDefinition, AsyncCallback<QueryResultDTO<ResultType>> callback);
 
     void getPredefinedQueryIdentifiers(AsyncCallback<HashSet<PredefinedQueryIdentifier>> callback);
     
     void getPredefinedQueryDefinition(PredefinedQueryIdentifier identifier, String localeInfoName,
-            AsyncCallback<StatisticQueryDefinitionDTO> callback);
+            AsyncCallback<ModifiableStatisticQueryDefinitionDTO> callback);
 
     <ResultType extends Serializable> void runPredefinedQuery(DataMiningSession session,
             PredefinedQueryIdentifier identifier, String localeInfoName,
             AsyncCallback<QueryResultDTO<ResultType>> callback);
     
-    void localize(StatisticQueryDefinitionDTO queryDefinition, String localeInfoName,
-            AsyncCallback<StatisticQueryDefinitionDTO> callback);
+    void localize(ModifiableStatisticQueryDefinitionDTO queryDefinition, String localeInfoName,
+            AsyncCallback<ModifiableStatisticQueryDefinitionDTO> callback);
 
     /**
      * This method does nothing, but is needed to ensure, that some classes for the data mining (like
@@ -79,14 +81,15 @@ public interface DataMiningServiceAsync {
     void pseudoMethodSoThatSomeClassesAreAddedToTheGWTSerializationPolicy(AsyncCallback<SerializationDummy> callback);
 
     /** Retrieves the {@link StoredDataMiningQueryDTO}s from the back end. */
-    void retrieveStoredQueries(AsyncCallback<ArrayList<StoredDataMiningQueryDTO>> callback);
+    void retrieveStoredQueries(AsyncCallback<ArrayList<StoredDataMiningQueryDTOImpl>> callback);
 
     /** Updates or creates a {@link StoredDataMiningQueryDTO} in the back end. */
-    void updateOrCreateStoredQuery(StoredDataMiningQueryDTO query, AsyncCallback<StoredDataMiningQueryDTO> callback);
+    void updateOrCreateStoredQuery(StoredDataMiningQueryDTOImpl query,
+            AsyncCallback<StoredDataMiningQueryDTOImpl> callback);
 
     /** Removes the {@link StoredDataMiningQueryDTO} if it exists from the back end. */
-    void removeStoredQuery(StoredDataMiningQueryDTO query, AsyncCallback<StoredDataMiningQueryDTO> callback);
+    void removeStoredQuery(StoredDataMiningQueryDTOImpl query, AsyncCallback<StoredDataMiningQueryDTOImpl> callback);
 
     /** Gets the {@link StatisticQueryDefinitionDTO} from the serialized String. */
-    void getDeserializedQuery(String serializedQuery, AsyncCallback<StatisticQueryDefinitionDTO> callback);
+    void getDeserializedQuery(String serializedQuery, AsyncCallback<ModifiableStatisticQueryDefinitionDTO> callback);
 }

java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java

@@ -19,6 +19,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.sap.sse.common.Util;
 import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.PredefinedQueryIdentifier;
+import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.ui.client.DataMiningServiceAsync;
 import com.sap.sse.datamining.ui.client.QueryDefinitionProvider;
 import com.sap.sse.datamining.ui.client.StringMessages;
@@ -140,9 +141,10 @@ public class PredefinedQueryRunner extends ComponentWithoutSettings {
     protected void runSelectedPredefinedQuery() {
         PredefinedQueryIdentifier predefinedQueryIdentifier = selectionListBox.getValue();
         dataMiningService.getPredefinedQueryDefinition(predefinedQueryIdentifier,
-                LocaleInfo.getCurrentLocale().getLocaleName(), new AsyncCallback<StatisticQueryDefinitionDTO>() {
+                LocaleInfo.getCurrentLocale().getLocaleName(),
+                new AsyncCallback<ModifiableStatisticQueryDefinitionDTO>() {
                     @Override
-                    public void onSuccess(StatisticQueryDefinitionDTO queryDefinition) {
+                    public void onSuccess(ModifiableStatisticQueryDefinitionDTO queryDefinition) {
                         queryDefinitionProvider.applyQueryDefinition(queryDefinition);
                         queryRunner.accept(queryDefinition);
                     }

java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java

@@ -11,6 +11,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.sap.sse.common.Util;
 import com.sap.sse.datamining.shared.DataMiningSession;
 import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO;
+import com.sap.sse.datamining.shared.impl.dto.ModifiableStatisticQueryDefinitionDTO;
 import com.sap.sse.datamining.shared.impl.dto.QueryResultDTO;
 import com.sap.sse.datamining.ui.client.AbstractDataMiningComponent;
 import com.sap.sse.datamining.ui.client.CompositeResultsPresenter;
@@ -92,7 +93,7 @@ public class SimpleQueryRunner extends AbstractDataMiningComponent<QueryRunnerSe
         if (errorMessages == null || !errorMessages.iterator().hasNext()) {
             counter.increase();
             resultsPresenter.showBusyIndicator(presenterId);
-            dataMiningService.runQuery(session, queryDefinition,
+            dataMiningService.runQuery(session, (ModifiableStatisticQueryDefinitionDTO) queryDefinition,
                     new ManagedDataMiningQueryCallback<Serializable>(counter) {
                         @Override
                         protected void handleSuccess(QueryResultDTO<Serializable> result) {

java/com.sap.sse.feature.runtime/feature.xml

@@ -32,34 +32,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="3.6.200.v20130402-1505"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator"
-         download-size="0"
-         install-size="0"
-         version="1.1.0.v20131217-1203"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher"
-         download-size="0"
-         install-size="0"
-         version="1.3.0.v20140415-2008"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.console"
-         download-size="0"
-         install-size="0"
-         version="1.1.0.v20140131-1639"
-         unpack="false"/>
-
    <plugin
          id="org.apache.felix.shell"
          download-size="0"
@@ -200,20 +172,6 @@
          version="9.4.8.v20171121"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="3.10.2.v20150203-1939"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="3.4.0.v20140312-2051"
-         unpack="false"/>
-
    <plugin
          id="slf4j.api"
          download-size="0"
@@ -386,7 +344,7 @@
          id="org.apache.commons.collections"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="3.2.2.v201511171945"
          unpack="false"/>
 
    <plugin
@@ -396,4 +354,109 @@
          version="9.4.8.v20171121"
          unpack="false"/>
 
+   <plugin
+         id="javax.xml"
+         download-size="0"
+         install-size="0"
+         version="1.3.4.v201005080400"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.activation.javax.activation"
+         download-size="0"
+         install-size="0"
+         version="1.2.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher"
+         download-size="0"
+         install-size="0"
+         version="1.4.0.v20161219-1356"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="3.12.100.v20180210-1608"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="3.6.0.v20170228-1906"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.cm"
+         download-size="0"
+         install-size="0"
+         version="1.2.0.v20170105-1446"
+         unpack="false"/>
+
+   <plugin
+         id="com.sap.sse.jersey.jaxbdependencyfragment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.istack.commons-runtime"
+         download-size="0"
+         install-size="0"
+         version="3.0.7"/>
+
+   <plugin
+         id="jaxb-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.sun.xml.bind.jaxb-impl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.stream"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.ws"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

java/com.sap.sse.jersey.jaxbdependencyfragment/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

java/com.sap.sse.jersey.jaxbdependencyfragment/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sse.jersey.jaxbdependencyfragment</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

java/com.sap.sse.jersey.jaxbdependencyfragment/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

java/com.sap.sse.jersey.jaxbdependencyfragment/.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

java/com.sap.sse.jersey.jaxbdependencyfragment/META-INF/MANIFEST.MF

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jaxbdependencyfragment
+Bundle-SymbolicName: com.sap.sse.jersey.jaxbdependencyfragment
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Fragment-Host: com.sun.jersey
+Automatic-Module-Name: com.sap.sse.jersey.jaxbdependencyfragment
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"

java/com.sap.sse.jersey.jaxbdependencyfragment/README

@@ -0,0 +1,3 @@
+This fragment to the com.sun.jersey bundle is used to declare an additional dependency on
+com.sun.xml.bind.jaxb-impl which contains the javax.xml.bind implementation since it was
+removed from the JDK in Java 11.

java/com.sap.sse.jersey.jaxbdependencyfragment/build.properties

@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               .

java/com.sap.sse.jersey.jaxbdependencyfragment/pom.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sse.jersey.jaxbdependencyfragment</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>

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

@@ -6,6 +6,7 @@ import java.util.logging.Logger;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
+import com.mongodb.MongoClientURI;
 import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
 
 public class Activator implements BundleActivator {
@@ -13,30 +14,43 @@ public class Activator implements BundleActivator {
     
     @Override
     public void start(BundleContext context) throws Exception {
-
-        MongoDBConfiguration defaultConfiguration = MongoDBConfiguration.getDefaultConfiguration(); 
-        
-        String databaseName = context.getProperty(MongoDBConfiguration.MONGO_DB_NAME);
-        if (databaseName == null) {
-            databaseName = defaultConfiguration.getDatabaseName();
+        MongoDBConfiguration defaultConfiguration = MongoDBConfiguration.getDefaultConfiguration();
+        final MongoDBConfiguration newConfiguration;
+        final String mongoClientURI = context.getProperty(MongoDBConfiguration.MONGO_URI);
+        if (mongoClientURI != null) {
+            logger.info("found "+MongoDBConfiguration.MONGO_URI+"="+mongoClientURI);
+            newConfiguration = new MongoDBConfiguration(new MongoClientURI(
+                    context.getProperty(MongoDBConfiguration.MONGO_URI), MongoDBConfiguration.getDefaultOptionsBuilder()));
         } else {
-            logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_DB_NAME+"="+databaseName);
+            final String databaseNameProperty = context.getProperty(MongoDBConfiguration.MONGO_DB_NAME);
+            final String databaseName;
+            if (databaseNameProperty == null) {
+                databaseName = defaultConfiguration.getMongoClientURI().getDatabase();
+            } else {
+                databaseName = databaseNameProperty;
+                logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_DB_NAME+"="+databaseName);
+            }
+            final String hostNameFromProperty = context.getProperty(MongoDBConfiguration.MONGO_HOSTNAME);
+            final String hostName;
+            final String[] primaryHostAndPort = defaultConfiguration.getMongoClientURI().getHosts().get(0).split(":");
+            if (hostNameFromProperty != null) {
+                logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_HOSTNAME+"="+hostNameFromProperty);
+                hostName = hostNameFromProperty;
+            } else {
+                hostName = defaultConfiguration.getMongoClientURI().getHosts().get(0).split(":")[0];
+            }
+            if (context.getProperty(MongoDBConfiguration.MONGO_PORT) == null) {
+                if (primaryHostAndPort.length > 1) {
+                    newConfiguration = new MongoDBConfiguration(hostName, Integer.valueOf(primaryHostAndPort[1]), databaseName);
+                } else {
+                    newConfiguration = new MongoDBConfiguration(hostName, databaseName);
+                }
+            } else {
+                final String portAsString = context.getProperty(MongoDBConfiguration.MONGO_PORT);
+                logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_PORT+"="+portAsString);
+                newConfiguration = new MongoDBConfiguration(hostName, Integer.valueOf(portAsString), databaseName);
+            }
         }
-        String hostName = context.getProperty(MongoDBConfiguration.MONGO_HOSTNAME);
-        if (hostName == null) {
-            hostName = defaultConfiguration.getHostName();
-        } else {
-            logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_HOSTNAME+"="+hostName);
-        }
-        int port;
-        if(context.getProperty(MongoDBConfiguration.MONGO_PORT) == null) {
-            port = defaultConfiguration.getPort();
-        } else {
-            port = Integer.valueOf(context.getProperty(MongoDBConfiguration.MONGO_PORT));
-            logger.log(Level.INFO, "found "+MongoDBConfiguration.MONGO_PORT+"="+port);
-        }
-
-        MongoDBConfiguration newConfiguration = new MongoDBConfiguration(hostName, port, databaseName); 
         ((MongoDBServiceImpl) MongoDBService.INSTANCE).setConfiguration(newConfiguration);
     }
     

java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/MongoDBConfiguration.java

@@ -1,5 +1,10 @@
 package com.sap.sse.mongodb;
 
+import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoClientOptions.Builder;
+import com.mongodb.MongoClientURI;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
 import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
 
 /**
@@ -9,38 +14,49 @@ import com.sap.sse.mongodb.internal.MongoDBServiceImpl;
  */
 public class MongoDBConfiguration {
 
-    public static final String MONGO_PORT = "mongo.port";
-    public static final String MONGO_HOSTNAME = "mongo.host";
-    public static final String MONGO_DB_NAME = "mongo.dbName";
-
+    static final String MONGO_PORT = "mongo.port";
+    static final String MONGO_HOSTNAME = "mongo.host";
+    static final String MONGO_DB_NAME = "mongo.dbName";
+    
+    /**
+     * The system property by this name may contain a MongoClientURI in its string representation:
+     * <pre>
+     *   mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database[.collection]][?options]]
+     * </pre>
+     * See also {@link MongoClientURI}.
+     */
+    static final String MONGO_URI = "mongo.uri";
+    
     private static String DEFAULT_DB_NAME = "winddb"; 
     private static String DEFAULT_TEST_DB_NAME = "winddbTest"; 
 
-    private String hostName;
-    private int port;
-    private String databaseName;
+    private final MongoClientURI mongoClientURI;
 
     public static MongoDBConfiguration getDefaultConfiguration() {
-        String defaultHostName = "127.0.0.1";
-        if (System.getProperty(MONGO_HOSTNAME) != null) {
-            defaultHostName = System.getProperty(MONGO_HOSTNAME);
+        final MongoDBConfiguration result;
+        if (System.getProperty(MONGO_URI) != null) {
+            result = new MongoDBConfiguration(new MongoClientURI(System.getProperty(MONGO_URI)));
         } else {
-            if (System.getenv("MONGODB_HOST") != null) {
-                defaultHostName = System.getenv("MONGODB_HOST");
+            String defaultHostName = "127.0.0.1";
+            if (System.getProperty(MONGO_HOSTNAME) != null) {
+                defaultHostName = System.getProperty(MONGO_HOSTNAME);
+            } else {
+                if (System.getenv("MONGODB_HOST") != null) {
+                    defaultHostName = System.getenv("MONGODB_HOST");
+                }
+            }
+            String defaultDatabaseName = System.getProperty(MONGO_DB_NAME, DEFAULT_DB_NAME);
+            if (System.getProperty(MONGO_PORT) != null) {
+                result = new MongoDBConfiguration(defaultHostName, Integer.valueOf(System.getProperty(MONGO_PORT).trim()), defaultDatabaseName);
+            } else {
+                if (System.getenv("MONGODB_PORT") != null) {
+                    result = new MongoDBConfiguration(defaultHostName, Integer.valueOf(System.getenv("MONGODB_PORT").trim()), defaultDatabaseName);
+                } else {
+                    result = new MongoDBConfiguration(defaultHostName, defaultDatabaseName);
+                }
             }
         }
-        
-        int defaultPort = 27017;
-        if (System.getProperty(MONGO_PORT) != null) {
-            defaultPort = Integer.valueOf(System.getProperty(MONGO_PORT).trim());
-        } else {
-            if (System.getenv("MONGODB_PORT") != null) {
-                defaultPort = Integer.valueOf(System.getenv("MONGODB_PORT").trim());
-            }
-        }
-        String defaultDatabaseName = System.getProperty(MONGO_DB_NAME, DEFAULT_DB_NAME);
-                
-        return new MongoDBConfiguration(defaultHostName, defaultPort, defaultDatabaseName);
+        return result;
     }
 
     public static MongoDBConfiguration getDefaultTestConfiguration() {
@@ -52,26 +68,36 @@ public class MongoDBConfiguration {
                 defaultHostName = System.getenv("MONGODB_HOST");
             }
         }
-        
-        int defaultPort = 27017;
+        String defaultDatabaseName = System.getProperty(MONGO_DB_NAME, DEFAULT_TEST_DB_NAME);
+        final MongoDBConfiguration result;
         if (System.getProperty(MONGO_PORT) != null) {
-            defaultPort = Integer.valueOf(System.getProperty(MONGO_PORT).trim());
+            result = new MongoDBConfiguration(defaultHostName, Integer.valueOf(System.getProperty(MONGO_PORT).trim()), defaultDatabaseName);
         } else {
             if (System.getenv("MONGODB_PORT") != null) {
-                defaultPort = Integer.valueOf(System.getenv("MONGODB_PORT").trim());
+                result = new MongoDBConfiguration(defaultHostName, Integer.valueOf(System.getenv("MONGODB_PORT").trim()), defaultDatabaseName);
+            } else {
+                result = new MongoDBConfiguration(defaultHostName, defaultDatabaseName);
             }
         }
-        String defaultDatabaseName = System.getProperty(MONGO_DB_NAME, DEFAULT_TEST_DB_NAME);
-                
-        return new MongoDBConfiguration(defaultHostName, defaultPort, defaultDatabaseName);
+        return result;
+    }
+
+    public MongoDBConfiguration(String mongoClientURIAsString) {
+        this.mongoClientURI = new MongoClientURI(mongoClientURIAsString, getDefaultOptionsBuilder());
+    }
+
+    public MongoDBConfiguration(MongoClientURI mongoClientURI) {
+        this.mongoClientURI = mongoClientURI;
+    }
+
+    public MongoDBConfiguration(String hostName, String databaseName) {
+        this.mongoClientURI = new MongoClientURI("mongodb://"+hostName+"/"+databaseName, getDefaultOptionsBuilder());
     }
 
     public MongoDBConfiguration(String hostName, int port, String databaseName) {
-        this.hostName = hostName;
-        this.port = port;
-        this.databaseName = databaseName;
+        this.mongoClientURI = new MongoClientURI("mongodb://"+hostName+":"+port+"/"+databaseName);
     }
-    
+
     /**
      * Creates and returns a DB service for this configuration
      */
@@ -79,16 +105,27 @@ public class MongoDBConfiguration {
         return new MongoDBServiceImpl(this);
     }
 
-    public String getHostName() {
-        return hostName;
+    public MongoClientURI getMongoClientURI() {
+        return mongoClientURI;
     }
 
-    public int getPort() {
-        return port;
+    public static MongoClientOptions.Builder getDefaultOptionsBuilder() {
+        return new Builder().readPreference(ReadPreference.primaryPreferred());
     }
 
     public String getDatabaseName() {
-        return databaseName;
+        return getMongoClientURI().getDatabase();
     }
 
+    public String getHostname() {
+        return getMongoClientURI().getHosts().get(0).split(":")[0];
+    }
+
+    public int getPort() {
+        int result = ServerAddress.defaultPort();
+        if (!getMongoClientURI().getHosts().isEmpty() && getMongoClientURI().getHosts().get(0).split(":").length > 1) {
+            result = Integer.valueOf(getMongoClientURI().getHosts().get(0).split(":")[1]);
+        }
+        return result;
+    }
 }

java/com.sap.sse.mongodb/src/com/sap/sse/mongodb/internal/MongoDBServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.logging.Logger;
 import com.mongodb.DB;
 import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
+import com.mongodb.MongoClientURI;
 import com.sap.sse.mongodb.AlreadyRegisteredException;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
@@ -19,9 +20,9 @@ public class MongoDBServiceImpl implements MongoDBService {
 
     private MongoDBConfiguration configuration;
 
-    private final Map<com.sap.sse.common.Util.Pair<String, Integer>, Mongo> mongos;
+    private final Map<MongoClientURI, Mongo> mongos;
     
-    private final Map<com.sap.sse.common.Util.Pair<String, Integer>, DB> dbs;
+    private final Map<MongoClientURI, DB> dbs;
 
     /**
      * collection name -> fully qualified class name
@@ -29,8 +30,8 @@ public class MongoDBServiceImpl implements MongoDBService {
     private final Map<String, String> registered;
 
     public MongoDBServiceImpl() {
-        mongos = new HashMap<com.sap.sse.common.Util.Pair<String, Integer>, Mongo>();
-        dbs = new HashMap<com.sap.sse.common.Util.Pair<String,Integer>, DB>();
+        mongos = new HashMap<>();
+        dbs = new HashMap<>();
         registered = new HashMap<String, String>();
     }
 
@@ -45,13 +46,13 @@ public class MongoDBServiceImpl implements MongoDBService {
 
     public void setConfiguration(MongoDBConfiguration configuration) {
         this.configuration = configuration;
-        logger.info("Used Mongo configuration: host:port/DBName: "+configuration.getHostName()+":"+configuration.getPort()+"/"+configuration.getDatabaseName());
+        logger.info("Used Mongo configuration: "+configuration.getMongoClientURI());
     }
 
     public DB getDB() {
         if (configuration == null) {
             configuration = MongoDBConfiguration.getDefaultTestConfiguration();
-            logger.info("Used default Mongo configuration: host:port/DBName: "+configuration.getHostName()+":"+configuration.getPort()+"/"+configuration.getDatabaseName());
+            logger.info("Used default Mongo configuration: "+configuration.getMongoClientURI());
         }
         try {
             return getDB(configuration);
@@ -61,15 +62,15 @@ public class MongoDBServiceImpl implements MongoDBService {
     }
     
     private synchronized DB getDB(MongoDBConfiguration mongoDBConfiguration) throws UnknownHostException {
-        com.sap.sse.common.Util.Pair<String, Integer> key = new com.sap.sse.common.Util.Pair<String, Integer>(mongoDBConfiguration.getHostName(), mongoDBConfiguration.getPort());
+        final MongoClientURI key = mongoDBConfiguration.getMongoClientURI();
         DB db = dbs.get(key);
         if (db == null) {
             Mongo mongo = mongos.get(key);
             if (mongo == null) {
-                mongo = new MongoClient(mongoDBConfiguration.getHostName(), mongoDBConfiguration.getPort());
+                mongo = new MongoClient(mongoDBConfiguration.getMongoClientURI());
                 mongos.put(key, mongo);
             }
-            db = mongo.getDB(mongoDBConfiguration.getDatabaseName());
+            db = mongo.getDB(mongoDBConfiguration.getMongoClientURI().getDatabase());
             dbs.put(key, db);
         }
         return db;

java/com.sap.sse.test/src/com/sap/sse/test/ImageConverterTest.java

@@ -16,7 +16,7 @@ import com.sap.sse.util.ImageConverter.ImageWithMetadata;
 
 /**
  * 
- * @author Robin Fleige(D067799)
+ * @author Robin Fleige (D067799)
  *
  */
 public class ImageConverterTest {
@@ -24,7 +24,8 @@ public class ImageConverterTest {
     private ImageWithMetadata pngImage;
     private ImageWithMetadata jpgImage;
 
-    private final byte[] onePixelPngExample = new byte[]{-119, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2, 0, 0, 0, -112, 119, 83, -34, 0, 0, 0, 12, 73, 68, 65, 84, 120, -38, 99, 96, 96, 96, 0, 0, 0, 4, 0, 1, -56, -22, -21, -7, 0, 0, 0, 0, 73, 69, 78, 68, -82, 66, 96, -126};
+    private final byte[] onePixelPngExample =        new byte[] { -119, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2, 0, 0, 0, -112, 119, 83, -34, 0, 0, 0, 12, 73, 68, 65, 84, 120, -38, 99, 96, 96, 96, 0, 0, 0, 4, 0, 1, -56, -22, -21, -7, 0, 0, 0, 0, 73, 69, 78, 68, -82, 66, 96, -126};
+    private final byte[] onePixelPngExample_Java11 = new byte[] { -119, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2, 0, 0, 0, -112, 119, 83, -34, 0, 0, 0, 12, 73, 68, 65, 84, 120, 94, 99, 96, 96, 96, 0, 0, 0, 4, 0, 1, 15, -46, -83, -28, 0, 0, 0, 0, 73, 69, 78, 68, -82, 66, 96, -126 };
     private final byte[] onePixelJpgExample = new byte[]{-1, -40, -1, -32, 0, 16, 74, 70, 73, 70, 0, 1, 2, 0, 0, 1, 0, 1, 0, 0, -1, -37, 0, 67, 0, 8, 6, 6, 7, 6, 5, 8, 7, 7, 7, 9, 9, 8, 10, 12, 20, 13, 12, 11, 11, 12, 25, 18, 19, 15, 20, 29, 26, 31, 30, 29, 26, 28, 28, 32, 36, 46, 39, 32, 34, 44, 35, 28, 28, 40, 55, 41, 44, 48, 49, 52, 52, 52, 31, 39, 57, 61, 56, 50, 60, 46, 51, 52, 50, -1, -37, 0, 67, 1, 9, 9, 9, 12, 11, 12, 24, 13, 13, 24, 50, 33, 28, 33, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, -1, -64, 0, 17, 8, 0, 1, 0, 1, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, -1, -60, 0, 31, 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, -1, -60, 0, -75, 16, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125, 1, 2, 3, 0, 4, 17, 5, 18, 33, 49, 65, 6, 19, 81, 97, 7, 34, 113, 20, 50, -127, -111, -95, 8, 35, 66, -79, -63, 21, 82, -47, -16, 36, 51, 98, 114, -126, 9, 10, 22, 23, 24, 25, 26, 37, 38, 39, 40, 41, 42, 52, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, -125, -124, -123, -122, -121, -120, -119, -118, -110, -109, -108, -107, -106, -105, -104, -103, -102, -94, -93, -92, -91, -90, -89, -88, -87, -86, -78, -77, -76, -75, -74, -73, -72, -71, -70, -62, -61, -60, -59, -58, -57, -56, -55, -54, -46, -45, -44, -43, -42, -41, -40, -39, -38, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -1, -60, 0, 31, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, -1, -60, 0, -75, 17, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119, 0, 1, 2, 3, 17, 4, 5, 33, 49, 6, 18, 65, 81, 7, 97, 113, 19, 34, 50, -127, 8, 20, 66, -111, -95, -79, -63, 9, 35, 51, 82, -16, 21, 98, 114, -47, 10, 22, 36, 52, -31, 37, -15, 23, 24, 25, 26, 38, 39, 40, 41, 42, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, -126, -125, -124, -123, -122, -121, -120, -119, -118, -110, -109, -108, -107, -106, -105, -104, -103, -102, -94, -93, -92, -91, -90, -89, -88, -87, -86, -78, -77, -76, -75, -74, -73, -72, -71, -70, -62, -61, -60, -59, -58, -57, -56, -55, -54, -46, -45, -44, -43, -42, -41, -40, -39, -38, -30, -29, -28, -27, -26, -25, -24, -23, -22, -14, -13, -12, -11, -10, -9, -8, -7, -6, -1, -38, 0, 12, 3, 1, 0, 2, 17, 3, 17, 0, 63, 0, -9, -6, 40, -94, -128, 63, -1, -39};
     
     private final int baseSize = 100;
@@ -74,6 +75,10 @@ public class ImageConverterTest {
         assertArrayEquals(onePixelJpgExample, byteArray);
         byteArray = converter.inputStreamToByteArray(
                 converter.imageWithMetadataToInputStream(pngImage.getImage(), pngImage.getMetadata(), "png"));
-        assertArrayEquals(onePixelPngExample, byteArray);
+        if (System.getProperty("java.version").startsWith("11")) {
+            assertArrayEquals(onePixelPngExample_Java11, byteArray);
+        } else {
+            assertArrayEquals(onePixelPngExample, byteArray);
+        }
     }
 }

java/com.sap.sse/META-INF/MANIFEST.MF

@@ -30,3 +30,4 @@ Import-Package: javax.servlet;version="3.1.0",
  org.osgi.framework;version="1.8.0",
  org.osgi.util.tracker;version="1.5.1"
 Automatic-Module-Name: com.sap.sse
+Bundle-Activator: com.sap.sse.impl.Activator

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

@@ -0,0 +1,39 @@
+package com.sap.sse.impl;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+/**
+ * Registers a shutdown hook that gracefully stops the OSGi framework by
+ * grabbing the system bundle and stopping it.
+ * 
+ * @author Axel Uhl (D043530)
+ *
+ */
+public class Activator implements BundleActivator {
+    private static final Logger logger = Logger.getLogger(Activator.class.getName());
+    
+    @Override
+    public void start(BundleContext context) throws Exception {
+        Runtime.getRuntime().addShutdownHook(new Thread(()->{
+            logger.info("Executing shutdown hook, gracefully shutting down OSGi framework");
+            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();
+            } catch (BundleException e) {
+                logger.log(Level.WARNING, "Exception while trying to gracefully stop the OSGi framework", e);
+            }
+        }, "com.sap.sse shutdown hook"));
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+    }
+}

java/pom.xml

@@ -79,6 +79,8 @@
       <modules>
         <module>com.sap.sse</module>
         <module>com.sap.sse.test</module>
+        <module>com.sap.sse.jersey.jaxbdependencyfragment</module>
+        <module>com.sap.sailing.routeconverterjava11extension</module>
         <module>com.sap.sse.mail</module>
         <module>com.sap.sse.mail.replication.test</module>
         <module>com.sap.sse.mail.replication.testsupport</module>

java/target/configuration/JavaSE-11.profile

@@ -0,0 +1,165 @@
+###############################################################################
+# Copyright (c) 2009, 2015 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+# NOTE: The JavaSE-9 profile is not yet finalized.
+
+org.osgi.framework.system.packages = \
+ javax.accessibility,\
+ javax.activity,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.jws,\
+ javax.jws.soap,\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.xml,\
+ javax.xml.crypto,\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.soap,\
+ javax.xml.stream,\
+ javax.xml.stream.events,\
+ javax.xml.stream.util,\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.xpath,\
+ org.ietf.jgss,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers
+org.osgi.framework.bootdelegation = \
+ javax.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
+ org.w3c.*,\
+ org.xml.*,\
+ sun.*,\
+ com.sun.*
+org.osgi.framework.executionenvironment = \
+ OSGi/Minimum-1.0,\
+ OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JavaSE/compact1-1.8,\
+ JavaSE/compact2-1.8,\
+ JavaSE/compact3-1.8,\
+ JRE-1.1,\
+ J2SE-1.2,\
+ J2SE-1.3,\
+ J2SE-1.4,\
+ J2SE-1.5,\
+ JavaSE-1.6,\
+ JavaSE-1.7,\
+ JavaSE-1.8,\
+ JavaSE-9
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 9.0, 10.0, 11.0",\
+ osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8, 9.0, 10.0, 11.0",\
+ osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8, 9.0, 10.0, 11.0",\
+ osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8, 9.0, 10.0, 11.0"
+osgi.java.profile.name = JavaSE-11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

java/target/configuration/jetty/etc/jetty-http.xml

@@ -35,7 +35,7 @@
           </Array>
         </Arg>
         <Set name="host"><Property name="jetty.http.host" deprecated="jetty.host" /></Set>
-        <Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="8888" /></Set>
+<Set name="port"><Property name="jetty.http.port" deprecated="jetty.port" default="8888"/></Set>
         <Set name="idleTimeout"><Property name="jetty.http.idleTimeout" deprecated="http.timeout" default="30000"/></Set>
         <Set name="soLingerTime"><Property name="jetty.http.soLingerTime" deprecated="http.soLingerTime" default="-1"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta" deprecated="http.acceptorPriorityDelta" default="0"/></Set>

java/target/configuration/mail.properties

@@ -1,5 +1,5 @@
 # mail configuration, e.g., for password recovery
-mail.enabled = false
+mail.enabled = true
 # For production:
 mail.from = noreply@sapsailing.com
 # For testing:
@@ -12,6 +12,7 @@ mail.smtp.host = 127.0.0.1
 # For testing externally:
 #mail.smtp.host = www.axel-uhl.de
 mail.smtp.port = 25
-mail.smtp.auth = true
+# Change mail.smtp.auth to true in case authentication is required by the SMTP server
+mail.smtp.auth = false
 mail.smtp.user = 
 mail.smtp.password = 

java/target/env.sh

@@ -29,33 +29,51 @@ REPLICATION_PORT=0
 # Make sure this is unique so that no other master is writing to this exchange at any time.
 REPLICATION_CHANNEL=sapsailinganalytics-master
 
-TELNET_PORT=14888
-SERVER_PORT=8888
-MONGODB_HOST=localhost
-MONGODB_PORT=27017
-MONGODB_NAME=winddb
-EXPEDITION_PORT=2010
+if [ -z $TELNET_PORT ]; then
+  TELNET_PORT=14888
+fi
+if [ -z $SERVER_PORT ]; then
+  SERVER_PORT=8888
+fi
+if [ -z $MONGODB_HOST ]; then
+  MONGODB_HOST=10.0.75.1
+fi
+if [ -z $MONGODB_PORT ]; then
+  MONGODB_PORT=27017
+fi
+if [ -z $MONGODB_NAME ]; then
+  MONGODB_NAME=winddb
+fi
+if [ -z $EXPEDITION_PORT ]; then
+  EXPEDITION_PORT=2010
+fi
 
 # To start replication upon startup provide the fully-qualified names of the Replicable service classes
 # for which to trigger replication. If you activate this make sure to
 # set the REPLICATE_MASTER_EXCHANGE_NAME variable to the
 # same channel the master is using in its REPLICATION_CHANNEL variable
 
-# REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl,com.sap.sailing.polars.impl.PolarDataServiceImpl,com.sap.sailing.domain.racelogtracking.impl.fixtracker.RegattaLogFixTrackerRegattaListener
+if [ -n "$AUTO_REPLICATE" ]; then
+  REPLICATE_ON_START=com.sap.sailing.server.impl.RacingEventServiceImpl,com.sap.sse.security.impl.SecurityServiceImpl,com.sap.sse.filestorage.impl.FileStorageManagementServiceImpl,com.sap.sse.mail.impl.MailServiceImpl,com.sap.sailing.polars.impl.PolarDataServiceImpl,com.sap.sailing.domain.racelogtracking.impl.fixtracker.RegattaLogFixTrackerRegattaListener
+fi
 # Host where the master Java instance is running
 # Make sure firewall configurations allow access
-REPLICATE_MASTER_SERVLET_HOST=
-REPLICATE_MASTER_SERVLET_PORT=
+#
+# REPLICATE_MASTER_SERVLET_HOST=
+# REPLICATE_MASTER_SERVLET_PORT=
 
 # Host where RabbitMQ is running 
-REPLICATE_MASTER_QUEUE_HOST=
+# REPLICATE_MASTER_QUEUE_HOST=
 # Port that RabbitMQ is listening on (normally something like 5672); use 0 to connect to RabbitMQ's default port
-REPLICATE_MASTER_QUEUE_PORT=0
+if [ -z $REPLICATE_MASTER_QUEUE_PORT ]; then
+  REPLICATE_MASTER_QUEUE_PORT=0
+fi
 
 # Exchange name that the master from which to auto-replicate is using as
 # its REPLICATION_CHANNEL variable, mapping to the master's replication.exchangeName
 # system property.
-REPLICATE_MASTER_EXCHANGE_NAME=
+#
+# REPLICATE_MASTER_EXCHANGE_NAME=
 
 # Automatic build and test configuration
 DEPLOY_TO=server
@@ -76,23 +94,42 @@ SERVER_STARTUP_NOTIFY=
 # Specify filename that is usually located at
 # http://release.sapsailing.com/ that should
 # be used as a base for the server
-INSTALL_FROM_RELEASE=
+#
+# INSTALL_FROM_RELEASE=
 
 # Specify name of file that can usually be found
 # at http://release.sapsailing.com/environments
-USE_ENVIRONMENT=
+#
+# USE_ENVIRONMENT=
 
 INSTANCE_ID="$SERVER_NAME:$SERVER_PORT"
-ADDITIONAL_JAVA_ARGS="-Dpersistentcompetitors.clear=false -XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -verbose:gc -XX:MaxGCPauseMillis=500 -XX:+PrintAdaptiveSizePolicy -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Xloggc:logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M -XX:MaxGCPauseMillis=500 -XX:+PrintAdaptiveSizePolicy"
-
-# Uncomment for use with SAP JVM only:
-#ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -XX:+GCHistory -XX:GCHistoryFilename=logs/sapjvm_gc@PID.prf"
-
 if [[ ! -d $JAVA_HOME ]] && [[ -f "/usr/libexec/java_home" ]]; then
     JAVA_HOME=`/usr/libexec/java_home`
 fi
-
+JAVA_BINARY="$JAVA_HOME/bin/java"
+JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | sed 's/^.* version "\(.*\)\.\(.*\)\..*".*$/\1.\2/; 1q')
+export JAVA_11_ARGS="-Dosgi.java.profile=file://`pwd`/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -XX:ThreadPriorityPolicy=1 -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Xlog:gc+ergo*=trace:file=logs/gc_ergo.log:time:filecount=10,filesize=100000 -Xlog:gc*:file=logs/gc.log:time:filecount=10,filesize=100000"
+echo JAVA_11_ARGS is $JAVA_11_ARGS
+export JAVA_8_ARGS="-XX:ThreadPriorityPolicy=2 -XX:+UseG1GC -XX:+PrintAdaptiveSizePolicy -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -Xloggc:logs/gc.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
+echo JAVA_8_ARGS is $JAVA_8_ARGS
+echo JAVA_VERSION detected: $JAVA_VERSION
+if echo $JAVA_VERSION | grep -q "^11\."; then
+  echo Java 11 detected
+  echo JAVA_11_ARGS are $JAVA_11_ARGS
+  JAVA_VERSION_SPECIFIC_ARGS=$JAVA_11_ARGS
+else
+  echo Java other than 11 detected
+  echo JAVA_8_ARGS are $JAVA_8_ARGS
+  JAVA_VERSION_SPECIFIC_ARGS=$JAVA_8_ARGS
+fi
+echo JAVA_VERSION_SPECIFIC_ARGS are: $JAVA_VERSION_SPECIFIC_ARGS
+ADDITIONAL_JAVA_ARGS="$JAVA_VERSION_SPECIFIC_ARGS $ADDITIONAL_JAVA_ARGS -Dpersistentcompetitors.clear=false -XX:MaxGCPauseMillis=500"
+# options for use with SAP JVM only:
+if "$JAVA_BINARY" -version 2>&1 | grep -q "SAP Java"; then
+  echo SAP JVM detected
+  ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -XX:+GCHistory -XX:GCHistoryFilename=logs/sapjvm_gc@PID.prf"
+fi
+echo ADDITIONAL_JAVA_ARGS=${ADDITIONAL_JAVA_ARGS}
 ON_AMAZON=`command -v ec2-metadata`
 
 # **** Overwritten environment variables ****
-

java/target/start

@@ -74,11 +74,31 @@ sed $SED_ARGS "s/System:.*$/ System: $MONGODB_HOST:$MONGODB_PORT\/$MONGODB_NAME-
 # Apply app parameters from env.sh
 APP_PARAMETERS="-Dmongo.host=$MONGODB_HOST -Dmongo.port=$MONGODB_PORT -Dmongo.dbName=$MONGODB_NAME -Dexpedition.udp.port=$EXPEDITION_PORT -Dreplication.exchangeHost=$REPLICATION_HOST -Dreplication.exchangePort=$REPLICATION_PORT -Dreplication.exchangeName=$REPLICATION_CHANNEL"
 
+# Append mail-related environment variables to configuration/mail.properties to override defaults
+if [ -n "$MAIL_FROM" ]; then
+  echo "mail.from = $MAIL_FROM" >>configuration/mail.properties
+fi
+if [ -n "$MAIL_SMTP_HOST" ]; then
+  echo "mail.smtp.host = $MAIL_SMTP_HOST" >>configuration/mail.properties
+fi
+if [ -n "$MAIL_SMTP_PORT" ]; then
+  echo "mail.smtp.port = $MAIL_SMTP_PORT" >>configuration/mail.properties
+fi
+if [ -n "$MAIL_AUTH" ]; then
+  echo "mail.auth = $MAIL_AUTH" >>configuration/mail.properties
+fi
+if [ -n "$MAIL_SMTP_USER" ]; then
+  echo "mail.smtp.user = $MAIL_SMTP_USER" >>configuration/mail.properties
+fi
+if [ -n "$MAIL_SMTP_PASSWORD" ]; then
+  echo "mail.smtp.password = $MAIL_SMTP_PASSWORD" >>configuration/mail.properties
+fi
+
 # Apply parameters for automatic replication start
 REPLICATION_PARAMETERS="-Dreplicate.on.start=$REPLICATE_ON_START -Dreplicate.master.servlet.host=$REPLICATE_MASTER_SERVLET_HOST -Dreplicate.master.servlet.port=$REPLICATE_MASTER_SERVLET_PORT -Dreplicate.master.queue.host=$REPLICATE_MASTER_QUEUE_HOST -Dreplicate.master.queue.port=$REPLICATE_MASTER_QUEUE_PORT -Dreplicate.master.exchange.name=$REPLICATE_MASTER_EXCHANGE_NAME"
 
 if [[ $PARAM == "" ]] || [[ $PARAM == "no-update" ]]; then
-    nohup $JAVA_BINARY -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Dosgi.shell.telnet.port=$TELNET_PORT -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar -configuration ./ -clean 2>/dev/null >/dev/null &
+    nohup $JAVA_BINARY -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Dosgi.shell.telnet.port=$TELNET_PORT -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar -configuration ./ -clean 2>/dev/null >/dev/null &
     JAVA_PID=$!
     echo "Starting server... (PID: $JAVA_PID)"
     echo "SERVER_NAME: $SERVER_NAME"
@@ -133,10 +153,11 @@ if [[ $PARAM == "" ]] || [[ $PARAM == "no-update" ]]; then
     fi
 elif [[ $PARAM == "debug" ]]; then
     echo "Starting remote debugging session on port 8000 - make sure this port is open and reachable from the outside"
-    $JAVA_BINARY -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=y -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar -console -configuration ./ -clean
+    JFR_OPTIONS="-XX:+FlightRecorder -Dcom.sun.management.jmxremote.port=7091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.rmi.port=7091 -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost"
+    $JAVA_BINARY -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=*:8000,suspend=y $JFR_OPTIONS -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar -console -configuration ./ -clean
 
 elif [[ $PARAM == "fg" ]]; then
-    $JAVA_BINARY -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar -console -configuration ./ -clean
+    exec $JAVA_BINARY -D$SERVER_NAME $ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.server.name=$SERVER_NAME $APP_PARAMETERS $REPLICATION_PARAMETERS -Djava.io.tmpdir="$PWD/tmp" -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx$MEMORY -jar plugins/org.eclipse.equinox.launcher_1.4.0.v20161219-1356.jar -console -configuration ./ -clean
 
 fi
 

mobile/com.sap.sailing.buoy.positioning/.classpath

@@ -7,5 +7,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/google-android-support-v4"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/google-android-support-v7-appcompat_lib"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>