Merge branch 'racecommittee_app' into racecommittee_app_startphases

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java

configuration/buildAndUpdateProduct.sh

@@ -51,7 +51,11 @@ fi
 
 cd $PROJECT_HOME
 active_branch=$(git symbolic-ref -q HEAD)
-active_branch=`basename $active_branch`
+if [[ $active_branch == "" ]]; then
+    active_branch="unknown"
+else
+    active_branch=`basename $active_branch`
+fi
 
 HEAD_SHA=$(git show-ref --head -s | head -1)
 HEAD_DATE=$(date "+%Y%m%d%H%M")
@@ -122,6 +126,7 @@ fi
 echo PROJECT_HOME is $PROJECT_HOME
 echo SERVERS_HOME is $SERVERS_HOME
 echo BRANCH is $active_branch
+echo VERSION is $VERSION_INFO
 
 options=':bgtocprm:n:l:s:w:u'
 while getopts $options option
@@ -129,7 +134,7 @@ do
     case $option in
         g) gwtcompile=0;;
         t) testing=0;;
-	b) onegwtpermutationonly=1;;
+	    b) onegwtpermutationonly=1;;
         o) offline=1;;
         c) clean="";;
         p) proxy=1;;
@@ -164,22 +169,25 @@ if [[ "$@" == "release" ]]; then
     fi
 
     RELEASE_NOTES=""
-    echo ""
-    echo "Please provide me with some notes about this release. You can add more than"
-    echo "one line. Please include major changes or new features. After your notes I will"
-    echo "also include the commits of the last 4 weeks. You can save and quit by hitting ctrl+d."
-    while read -e -p "> " line; do
-        RELEASE_NOTES="$RELEASE_NOTES\n$line"
-    done
+    COMMIT_WEEK_COUNT=4
+	if [ $suppress_confirmation -eq 0 ]; then
+        echo ""
+        echo "Please provide me with some notes about this release. You can add more than"
+        echo "one line. Please include major changes or new features. After your notes I will"
+        echo "also include the commits of the last 4 weeks. You can save and quit by hitting ctrl+d."
+        while read -e -p "> " line; do
+            RELEASE_NOTES="$RELEASE_NOTES\n$line"
+        done
 
-    if [[ $RELEASE_NOTES == "" ]]; then
-        echo -e "\nCome on - I can not release without at least some notes about this release!"
-        exit
+        if [[ $RELEASE_NOTES == "" ]]; then
+            echo -e "\nCome on - I can not release without at least some notes about this release!"
+            exit
+        fi
+        echo -e "\nThank you! One last thing..."
+
+        echo "How many weeks of commits do you want to include (0=No commits)?"
+        read -p "> " -e COMMIT_WEEK_COUNT
     fi
-    echo -e "\nThank you! One last thing..."
-
-    echo "How many weeks of commits do you want to include (0=No commits)?"
-    read -p "> " -e COMMIT_WEEK_COUNT
 
     mkdir -p $PROJECT_HOME/dist
     mkdir -p $PROJECT_HOME/build
@@ -201,6 +209,7 @@ if [[ "$@" == "release" ]]; 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/updateEC2Instance.sh $ACDIR/
     cp -v $PROJECT_HOME/java/target/shouldIBuildOrShouldIGo.sh $ACDIR/
 
     cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/
@@ -220,18 +229,8 @@ if [[ "$@" == "release" ]]; then
     cp -rv $PROJECT_HOME/configuration/native-libraries $ACDIR/
     cp -v $PROJECT_HOME/configuration/buildAndUpdateProduct.sh $ACDIR/
 
-    # make sure to save the information from env.sh
-    . $ACDIR/env.sh
-
     echo "$VERSION_INFO System:" > $ACDIR/configuration/jetty/version.txt
 
-    sed -i "/mongo.host/d" "$ACDIR/configuration/config.ini"
-    sed -i "/mongo.port/d" "$ACDIR/configuration/config.ini"
-    sed -i "/expedition.udp.port/d" "$ACDIR/configuration/config.ini"
-    sed -i "/replication.exchangeName/d" "$ACDIR/configuration/config.ini"
-    sed -i "/replication.exchangeHost/d" "$ACDIR/configuration/config.ini"
-    sed -i "s/^.*jetty.port.*$/<Set name=\"port\"><Property name=\"jetty.port\" default=\"$SERVER_PORT\"\/><\/Set>/g" "$ACDIR/configuration/jetty/etc/jetty-selector.xml"
-
     if [[ $OSGI_BUNDLE_NAME != "" ]]; then
         SIMPLE_VERSION_INFO=$OSGI_BUNDLE_NAME
     fi
@@ -525,6 +524,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/updateEC2Instance.sh $ACDIR/
     cp -v $PROJECT_HOME/java/target/shouldIBuildOrShouldIGo.sh $ACDIR/
 
     if [ ! -f "$ACDIR/env.sh" ]; then