From 151b6735bfb75d70bb7d591924be2300a8aae3b7 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 4 Nov 2014 08:44:51 +0000 Subject: [PATCH 1/5] Updated typical development scenarios (markdown) --- wiki/typical-development-scenarios.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wiki/typical-development-scenarios.md b/wiki/typical-development-scenarios.md index 1207a6a10bd..3dfc74f7616 100644 --- a/wiki/typical-development-scenarios.md +++ b/wiki/typical-development-scenarios.md @@ -11,9 +11,9 @@ Add a New Library which can not be found in any SAP Repository * In case the library is not OSGi-enabled someone has to create such a OSGi-enabled version (ask the technical lead of the project) * Add the library to an appropriate target folder under plugins/ in the project com.sap.sailing.targetplatform.base (e.g. target-base) * Add a corresponding entry to the corresponding feature.xml in the project com.sap.sailing.targetplatform.base -* Rebuild the base target platform by running the script createLocalBaseP2repository.sh (com.sap.sailing.targetplatform/scripts). The script needs to be adjusted to your local paths for your Eclipse and GIT workspace directories. +* Rebuild the base target platform by running the script `createLocalBaseP2repository.sh` (com.sap.sailing.targetplatform/scripts). The script needs to be adjusted to your local paths for your Eclipse and GIT workspace directories. * Test the new overall target platform by settings the race-analysis-p2-ide-p2admin.target as target platform in the IDE -• The admin of the central p2 repository (currently at sapsailing.com) must now replace the content of the central server /home/trac/p2-repositories/sailing with the content of the new local base p2 repository (com.sap.sailing.targetplatform/base/gen/p2) +* The admin of the central p2 repository (currently at sapsailing.com) must now replace the content of the central server /home/trac/p2-repositories/sailing with the content of the new local base p2 repository (com.sap.sailing.targetplatform/base/gen/p2), using the `uploadRepositoryToServer.sh` script * Reload the target platform in the IDE ## Adding or Upgrading Bundles from a p2 Repository From c1a6dbd763fc39a0a756cb6601c1ce7067fc6b2e Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Tue, 4 Nov 2014 13:02:54 +0000 Subject: [PATCH 2/5] Updated big data numbers (markdown) --- wiki/big-data-numbers.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wiki/big-data-numbers.md b/wiki/big-data-numbers.md index 449acd8b3ee..d80ce6dc937 100644 --- a/wiki/big-data-numbers.md +++ b/wiki/big-data-numbers.md @@ -14,3 +14,9 @@ Amount of data processed by the SAP Sailing Analytics during events. - 1,036,846 wind measurements with position, speed, course and heading of the unit, and speed and direction of the wind (58,063,376 bytes of memory) - 205,532 maneuvers analyzed (9,865,536 bytes or memory) +## Extreme Sailing Series 2014 (without Sydney) + +- 2,875,949 GPS fixes (220MB) +- 4,850,371 Wind fixes (310MB) + + From 902b830f1fdcf67f7fecd53f52926a7047ef9cf4 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Tue, 4 Nov 2014 13:18:33 +0000 Subject: [PATCH 3/5] Updated big data numbers (markdown) --- wiki/big-data-numbers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/big-data-numbers.md b/wiki/big-data-numbers.md index d80ce6dc937..f6be1def65f 100644 --- a/wiki/big-data-numbers.md +++ b/wiki/big-data-numbers.md @@ -17,6 +17,6 @@ Amount of data processed by the SAP Sailing Analytics during events. ## Extreme Sailing Series 2014 (without Sydney) - 2,875,949 GPS fixes (220MB) -- 4,850,371 Wind fixes (310MB) +- 4,850,371 Wind fixes (270MB) From b86324625a8e3480b410ae81d7b2e1b9d6536b59 Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Tue, 4 Nov 2014 16:35:33 +0100 Subject: [PATCH 4/5] Fixed bug 2319 --- java/target/refreshInstance.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/java/target/refreshInstance.sh b/java/target/refreshInstance.sh index 60ccbe3ea4f..f22c9e5ab94 100755 --- a/java/target/refreshInstance.sh +++ b/java/target/refreshInstance.sh @@ -80,9 +80,13 @@ copy_user_data_to_tmp_file () echo "Reading user-data provided by Amazon instance data to $ec2EnvVars_tmpFile" VARS=$(ec2-metadata -d | sed "s/user-data\: //g") - for var in $VARS; do - echo $var >>"$ec2EnvVars_tmpFile" - done + if [[ "$VARS" != "not available" ]]; then + for var in $VARS; do + echo $var >>"$ec2EnvVars_tmpFile" + done + else + echo "No user data has been provided." + fi } # loads the user data-provided variables by sourcing the script @@ -223,12 +227,12 @@ checks if [[ $OPERATION == "auto-install" ]]; then if [[ ! -z "$ON_AMAZON" ]]; then # first check and activate everything found in user data - copy_user_data_to_tmp_file + copy_user_data_to_tmp_file activate_user_data # then download and install environment and append to env.sh install_environment - # finally, append user data to env.sh as it shall take precedence over the installed environment's defaults - append_user_data_to_envsh + # finally, append user data to env.sh as it shall take precedence over the installed environment's defaults + append_user_data_to_envsh # make sure to reload data source `pwd`/env.sh From 11a18d4caa8b5a8db1b695eda470b7fd4fe0fc5d Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Tue, 4 Nov 2014 16:40:57 +0100 Subject: [PATCH 5/5] Fixed bug 2448 --- configuration/buildAndUpdateProduct.sh | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/configuration/buildAndUpdateProduct.sh b/configuration/buildAndUpdateProduct.sh index 4b2b783f0fb..67adb1d9c8c 100755 --- a/configuration/buildAndUpdateProduct.sh +++ b/configuration/buildAndUpdateProduct.sh @@ -653,6 +653,10 @@ if [[ "$@" == "install" ]] || [[ "$@" == "all" ]]; then mkdir $ACDIR/configuration fi + if [ ! -d "$ACDIR/configuration/jetty/etc" ]; then + mkdir -p $ACDIR/configuration/jetty/etc + fi + cd $ACDIR rm -rf $ACDIR/plugins/*.* @@ -664,23 +668,23 @@ 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/refreshInstance.sh $ACDIR/ + cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/ + cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR + + # overwrite configurations that should never be customized and belong to the build + cp -v $p2PluginRepository/configuration/config.ini configuration/ + cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty.xml configuration/jetty/etc + cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-selector.xml configuration/jetty/etc + cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml configuration/jetty/etc + cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties configuration/jetty/etc if [ ! -f "$ACDIR/env.sh" ]; then cp -v $PROJECT_HOME/java/target/env.sh $ACDIR/ - cp -v $p2PluginRepository/configuration/config.ini configuration/ - - mkdir -p configuration/jetty/etc - cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty.xml configuration/jetty/etc - cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-selector.xml configuration/jetty/etc - cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/jetty-deployer.xml configuration/jetty/etc - cp -v $PROJECT_HOME/java/target/configuration/jetty/etc/realm.properties configuration/jetty/etc - cp -v $PROJECT_HOME/java/target/configuration/monitoring.properties configuration/ - cp -v $PROJECT_HOME/java/target/configuration/security.properties configuration/ - - cp -v $PROJECT_HOME/java/target/udpmirror $ACDIR/ - cp -v $PROJECT_HOME/java/target/http2udpmirror $ACDIR - cp -v $PROJECT_HOME/java/target/configuration/logging.properties $ACDIR/configuration + cp -v $PROJECT_HOME/java/target/configuration/monitoring.properties $ACDIR/configuration/ + cp -v $PROJECT_HOME/java/target/configuration/security.properties $ACDIR/configuration/ + cp -v $PROJECT_HOME/java/target/configuration/logging.properties $ACDIR/configuration/ fi cp -r -v $p2PluginRepository/configuration/org.eclipse.equinox.simpleconfigurator configuration/