diff --git a/.gitattributes b/.gitattributes index d1467fbacd6642388d51c82bfd3ac6b40a631fe8..efabb92aa6885a731936a7e2c52a0a3fa4491da9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4737,9 +4737,6 @@ SAS/OTB/OTB/conf/ParmDBConfiguration.xml -text SAS/OTB/OTB/conf/Plotter-config-plottertest.jar -text SAS/OTB/OTB/dist-src/OTB -text svneol=unset#text/x-shellscript SAS/OTB/OTB/dist-src/OTB.log_prop -text -SAS/OTB/OTB/dist-src/showOTB -text svneol=unset#application/x-shellscript -SAS/OTB/OTB/dist-src/startOTB -text -SAS/OTB/OTB/dist-src/stopOTB -text svneol=unset#application/x-shellscript SAS/OTB/OTB/doc/OTB.EAP -text SAS/OTB/OTB/pom.xml -text SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java -text diff --git a/SAS/OTB/OTB/dist-src/showOTB b/SAS/OTB/OTB/dist-src/showOTB deleted file mode 100755 index d586fa6384b7e0f90647933e6a3ec86c76f29dd0..0000000000000000000000000000000000000000 --- a/SAS/OTB/OTB/dist-src/showOTB +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# -# Shop running OTB clients -# -# Usage: showOTB -# -# Author: A.P. Schoenmakers -# - - -echo "Finding OTB clients:" - -user_ports=( `ps -eaf | grep "otb\/client\/" | grep java | awk '{print $1":"$2":"$(NF-4)}'` ) - -if [ "$user_ports" == "" ]; then - echo "No OTB clients 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 client using port $port started by user $user with PID $pid" - done - - - diff --git a/SAS/OTB/OTB/dist-src/startOTB b/SAS/OTB/OTB/dist-src/startOTB deleted file mode 100755 index 6ac8b87441cb53c0ae17e2ba8e06dd3a70b69b60..0000000000000000000000000000000000000000 --- a/SAS/OTB/OTB/dist-src/startOTB +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# Check if portnumber is added to commandline; if yes, use it. -if [ -z $1 ]; then - port1=12500 -else - port1=$1 -fi -echo "Using port $port1 for this client" - -export OTB_DIR=/opt/sas/otb/client -export JAVA_HOME=/usr/java/jdk1.7.0_02 - -echo -echo --- Starting OTB Client --- - -otbfile=`ls $OTB_DIR/OTB*.jar | grep -v javadoc | grep -v sources` -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OTB_DIR -export OTB_APP=$OTB_DIR/`basename $otbfile` -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/OTBClient_${port1}_${curdate}.log" -echo "Logging client logs to file $logfile" -$JAVA_HOME/bin/java -cp $CLASSPATH nl.astron.lofar.sas.otb.Main -s sas001 -p $port1 -d LOFAR_4 -u busyman 2>&1 1>$logfile & -clientpid=$! -echo Started OTB client with PID: $clientpid diff --git a/SAS/OTB/OTB/dist-src/stopOTB b/SAS/OTB/OTB/dist-src/stopOTB deleted file mode 100755 index 5cc996ad6f043e965559e930efb584ac67958687..0000000000000000000000000000000000000000 --- a/SAS/OTB/OTB/dist-src/stopOTB +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# -# Stop running OTB client -# -# Usage: stopOTBServer [<port>] -# where <port> is the portnumber used by the client (default 12500) -# -# Author: A.P. Schoenmakers - -if [ -z $1 ]; then - port=12500 -else - port=$1 -fi - -echo "Finding clients using port $port" - -client_users=( `ps -eaf | grep "otb\/client\/" | grep java | grep $port | awk '{print $1}'` ) -client_pids=( `ps -eaf | grep "otb\/client\/" | grep java | grep $port| awk '{print $2}'` ) - -if [ ${#client_users[@]} == 0 ]; then - echo "No OTB clients running that use port $port" - exit -else - for client_pid in ${client_pids[@]} - do - echo "Found OTB with PID $client_pid; killing it now" - sudo kill $client_pid - done -fi -