diff --git a/.gitattributes b/.gitattributes index efabb92aa6885a731936a7e2c52a0a3fa4491da9..94b37e2203fcb1401ca9ddde87b3ea6ebd99fa2a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4836,9 +4836,6 @@ SAS/OTB/jOTDB3/CMakeLists.txt -text SAS/OTB/jOTDB3/assembly.xml -text SAS/OTB/jOTDB3/build.xml -text SAS/OTB/jOTDB3/dist-src/jOTDB3.log_prop -text -SAS/OTB/jOTDB3/dist-src/showServerOTB -text svneol=unset#application/x-shellscript -SAS/OTB/jOTDB3/dist-src/startServerOTB -text -SAS/OTB/jOTDB3/dist-src/stopServerOTB -text svneol=unset#application/x-shellscript SAS/OTB/jOTDB3/include/jOTDB3/CMakeLists.txt -text SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCampaign.h -text SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.h -text diff --git a/SAS/OTB/jOTDB3/dist-src/showServerOTB b/SAS/OTB/jOTDB3/dist-src/showServerOTB deleted file mode 100755 index c9397d90c27d187b9c9e969147601b202d0ad259..0000000000000000000000000000000000000000 --- a/SAS/OTB/jOTDB3/dist-src/showServerOTB +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Shop running OTB servers -# -# Usage: showServerOTB -# -# Author: A.P. Schoenmakers -# - - -echo "Finding OTB servers:" - -user_ports=( `ps -eaf | grep server | grep java | awk '{print $1":"$2":"$NF-1}'` ) - -if [ "$user_ports" == "" ]; then - echo "No such servers running" - exit -fi - -for user_port in "${user_ports[@]}" - do - user=`echo $user_port | awk -F: '{print $1}'` - pid=`echo $user_port | awk -F: '{print $2}'` - port=`echo $user_port | awk -F: '{print $3}'` - echo "Found server using port $port started by user $user with PID $pid" - done - - - diff --git a/SAS/OTB/jOTDB3/dist-src/startServerOTB b/SAS/OTB/jOTDB3/dist-src/startServerOTB deleted file mode 100755 index 04bdc0c92e9db28720e78e51e2e0fd66345b60ec..0000000000000000000000000000000000000000 --- a/SAS/OTB/jOTDB3/dist-src/startServerOTB +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Script to start OTB server. Default port is 12500, another portnumber -# can be provided on the commandline, e.g. -# -# startServerOTB 12600 -# - -# Check if portnumber is added to commandline; if yes, use it. -if [ -z $1 ]; then - port1=12500 - port2=12501 -else - port1=$1 - let port2=port1+1 -fi -echo "Using port $port1 and $port2 for this server" - -export OTB_DIR=/opt/sas/otb/server -export JAVA_HOME=/usr/java/jdk1.7.0_02 - -echo -echo --- Starting OTB Server --- - -# Prevent javadoc and source jar files to play a role -jotdb3file=`ls $OTB_DIR/jOTDB3*.jar | grep -v javadoc | grep -v sources` -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OTB_DIR -export OTB_APP=$OTB_DIR/`basename $jotdb3file` -export CLASSPATH=$OTB_APP - -for JAR_DEPENDENCY in $OTB_DIR/lib/*.jar -do - echo -- Adding dependency to CLASSPATH: `basename $JAR_DEPENDENCY` - export CLASSPATH=$CLASSPATH:$JAR_DEPENDENCY -done - -echo Starting up ... - -curdate=`date +%Y%m%dT%H%M%S` -logfile="/localhome/log/OTBServer_${port1}_${curdate}.log" -echo "Logging serverlogs to file $logfile" -serverpid=0 -# Find out if other server running already (with same port) -ps -ef | grep -v grep | grep java | grep server | grep $port1 2>&1 1>/dev/null -if [ $? -ne 0 ]; then - $JAVA_HOME/bin/java -cp $CLASSPATH nl.astron.lofar.sas.otb.jotdb3.jOTDBserver -s sas001 -d sasdb -p $port1 -o $port2 2>&1 1>&$logfile & - serverpid=$! - echo Started server with PID: $serverpid -else - echo "Server for port $port1 already running!" -fi diff --git a/SAS/OTB/jOTDB3/dist-src/stopServerOTB b/SAS/OTB/jOTDB3/dist-src/stopServerOTB deleted file mode 100755 index e42d76fc353328d1fa708128c7549f28de1a67cb..0000000000000000000000000000000000000000 --- a/SAS/OTB/jOTDB3/dist-src/stopServerOTB +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# Stop running OTB server -# -# Usage: stopOTBServer [<port>] -# where is the portnumber used by the server (default 12500) -# -# Author: A.P. Schoenmakers - -if [ -z $1 ]; then - port=12500 -else - port=$1 -fi - -echo "Finding server using port $port" - -user_port=`ps -eaf | grep server | grep java | grep $port | awk '{print $1,$2}'` - -if [ "$user_port" == "" ]; then - echo "No such server running" - exit -else - user=`echo $user_port | awk '{print $1}'` - pid=`echo $user_port | awk '{print $2}'` - echo "Found server running by user $user with PID $pid; killing it now" - if [ "$user" == "lofarsys" ]; then - kill $pid - else - sudo -u $user kill $pid - fi -fi - -