eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-02 10:23:51 +00:00
Code Activity

Merge branch 'master' into bug1407-new

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardRowDTO.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/target/start
This commit is contained in:
Axel Uhl committed 2013-06-10 11:23:47 +02:00
2 parents c2f6aee3f7 7eb9859b7a
commit ae90148d71
106 files changed
+1675 -671
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/target/env.sh
+18
View File
@@ -0,0 +1,18 @@
#!/bin/sh
SERVER_NAME=MASTER
MEMORY="1024m"
REPLICATION_CHANNEL=sapsailinganalytics-master
TELNET_PORT=14885
SERVER_PORT=8885
MONGODB_PORT=27017
EXPEDITION_PORT=2010
if [[ "$JAVA_HOME" == "" ]]; then
JAVA_HOME=$HOME/jdk1.7.0_02
echo "Setting JAVA_HOME to $JAVA_HOME"
fi
java/target/start
+4 -4
View File
@@ -1,11 +1,11 @@
#!/bin/sh
export TELNET_PORT=14886
export SERVER_NAME=MASTER
# source variables
. `pwd`/env.sh
export JAVA_HOME=/home/trac/jdk1.7.0_02
scriptdir=`dirname "$0"`
LIB_DIR=`pwd`/native-libraries
echo scriptdir is $scriptdir and LIB_DIR is $LIB_DIR
echo Script directory is $scriptdir and LIB_DIR is $LIB_DIR
nohup "$JAVA_HOME/bin/java" -XX:+UseMembar -D$SERVER_NAME -Dcom.sap.sailing.server.name=$SERVER_NAME -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 -Xmx8192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console $TELNET_PORT -configuration ./ -clean 2>/dev/null >/dev/null &
nohup "$JAVA_HOME/bin/java" -XX:+UseMembar -D$SERVER_NAME -Dcom.sap.sailing.server.name=$SERVER_NAME -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.2.0.v20110502.jar -console $TELNET_PORT -configuration ./ -clean &
echo "Started $SERVER_NAME on port $TELNET_PORT - use telnet localhost $TELNET_PORT to connect to the OSGi console"
java/target/stop
+7 -6
View File
@@ -1,13 +1,14 @@
#!/bin/bash
OSGI_TELNET_PORT=14886
TELNET_ACTIVE=`netstat -tlnp 2>/dev/null | grep ":$OSGI_TELNET_PORT"`
if [[ $OSGI_TELNET_PORT == "" ]] || [[ $TELNET_ACTIVE == "" ]]; then
echo "Could not find server on telnet port $OSGI_TELNET_PORT. Perhaps server is not running?"
. `pwd`/env.sh
TELNET_ACTIVE=`netstat -tlnp 2>/dev/null | grep ":$TELNET_PORT"`
if [[ $TELNET_PORT == "" ]] || [[ $TELNET_ACTIVE == "" ]]; then
echo "Could not find server on telnet port $TELNET_PORT. Perhaps server is not running?"
exit
fi
NC_CMD="nc -t 127.0.0.1 $OSGI_TELNET_PORT"
NC_CMD="nc -t 127.0.0.1 $TELNET_PORT"
echo -n exit | $NC_CMD > /dev/null
echo "Stopped server MASTER"
echo "Stopped server $SERVER_NAME"