Merge branch 'master' into course-update

java/target/http2udpmirror_axel_proxy

@@ -0,0 +1,16 @@
+#!/bin/sh
+#!/bin/sh
+target="`dirname \"$0\"`"
+pwd=`pwd`
+echo "$target" | grep "^/"
+if [ "$0" != "0" ]; then
+  # no leading slash, therefore no absolute path; prepend pwd
+  target="$pwd/$target"
+fi
+target=c:/data/SAP/sailing/workspace/java/target
+echo target is $target
+cd "$target/../com.sap.sailing.feature.p2build/bin/products/raceanalysis.product.id/win32/win32/x86_64"
+echo pwd is now `pwd`
+classpath="`find plugins -name 'com.sap.sailing.expeditionconnector_*.jar' | sort | tail -1`;`find plugins -name 'com.sap.sailing.domain.common_*.jar' | sort | tail -1`"
+echo Using classpath $classpath
+"$JAVA_HOME/bin/java" -cp "$classpath" -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -Djava.util.logging.config.file=$target/configuration/logging.properties com.sap.sailing.expeditionconnector.FromHttpToUdpMirror $*

java/target/install

@@ -8,7 +8,7 @@ echo Active branch is: $active_branch
 cd $exec_dir
 server_instance=`basename \`pwd\``
 echo Active server is: $server_instance
-if [ $active_branch == $server_instance ]
+if [ "$1" = "-f" -o $active_branch == $server_instance ]
 then
 p2PluginRepository=$GIT_DIR/java/com.sap.sailing.feature.p2build/bin/products/raceanalysis.product.id/linux/gtk/x86_64
 echo p2 repository for branch $active_branch: $p2PluginRepository
@@ -26,5 +26,6 @@ echo Done.
 else
    echo "********** CANCEL INSTALLATION **************************"
    echo "ACTIVE BRANCH DOES NOT FIT THE CURRENT SERVER INSTANCE!!!"
+   echo "Use option -f to force install"
 fi