diff --git a/.gitattributes b/.gitattributes index 954342ff2ca7499f7ff180e7f8e5bab3baf4b897..80b5d1302c7c82b29842d2dfc92b400cd5e830c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4289,13 +4289,6 @@ SAS/OTB/jRSP/.cvsignore -text SAS/OTB/jRSP/include/jRSP/nl_astron_lofar_sas_otb_jrsp_Board.h -text SAS/OTB/jRSP/pom.xml -text SAS/OTB/pom.xml -text svneol=unset#application/xml -SAS/OTB/scripts/CMakeLists.txt -text -SAS/OTB/scripts/src/CMakeLists.txt -text -SAS/OTB/scripts/src/checkOTDBServer -text -SAS/OTB/scripts/src/startOTB -text -SAS/OTB/scripts/src/startOTBServer -text -SAS/OTB/scripts/src/startOTBTest -text -SAS/OTB/scripts/src/stopOTBServer -text SAS/OTDB/SPRINT_1.8 -text SAS/OTDB/bin/copyTree.py -text SAS/OTDB/bin/create_new_database.sh -text svneol=unset#application/x-shellscript diff --git a/.gitignore b/.gitignore index 965ea86874653b0c37d0e3aecc4ce0e5e1718f61..4b7122446833768efc8b64ca839d8ff3630dd5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -273,9 +273,6 @@ SAS/OTB/jRSP/configure.in SAS/OTB/jRSP/nbproject SAS/OTB/jRSP/target SAS/OTB/nbproject -SAS/OTB/scripts/Makefile.common -SAS/OTB/scripts/autoconf_share -SAS/OTB/scripts/lofarconf SAS/OTDB/Makefile.common SAS/OTDB/autoconf_share SAS/OTDB/lofarconf diff --git a/SAS/OTB/scripts/CMakeLists.txt b/SAS/OTB/scripts/CMakeLists.txt deleted file mode 100644 index 1347f939ceb33cd23688c3d99d5b19f800f4da32..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -# $Id: $ - -add_subdirectory(src) diff --git a/SAS/OTB/scripts/src/CMakeLists.txt b/SAS/OTB/scripts/src/CMakeLists.txt deleted file mode 100644 index 74c8c7deef599120140d9774b88ffe60db7d5578..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -# $Id: $ - -install(PROGRAMS - checkOTDBServer - startOTB - startOTBServer - startOTBTest - stopOTBServer - DESTINATION sbin) diff --git a/SAS/OTB/scripts/src/checkOTDBServer b/SAS/OTB/scripts/src/checkOTDBServer deleted file mode 100755 index d8fc183332e5514d14ceca0cd04d76cdd8338ce0..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/checkOTDBServer +++ /dev/null @@ -1,25 +0,0 @@ -export serverDir=/opt/sas/server -export clientDir=/opt/sas/client -export JAVAHOME=/usr/java/jdk1.6.0_07 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir -check_logfile=/opt/lofar/var/log/checkOTDBServer.log -check_curdate=`date +%Y-%m-%d\ %H:%M:%S` - -start_server() -{ - curdate=`date +%Y%m%dT%H%M%S` - logfile="/opt/lofar/var/log/OTDBServer."$curdate - echo "Starting server: $JAVAHOME/bin/java -jar $serverDir/jOTDB2.jar paulus boskabouter LOFAR20 sas001 sas001 $port1 $port2 &" | tee -a $logfile - $JAVAHOME/bin/java -jar $serverDir/jOTDB2.jar paulus boskabouter LOFAR20 sas001 sas001 $port1 $port2 2>&1 1>$logfile& - serverpid=$! -} - -port1=13599 -port2=13600 -ps -ef | grep -v grep | grep java | grep $port1 2>&1 1>/dev/null -if [ $? -ne 0 ]; then - start_server - echo "[${check_curdate}]: Started server. See logfile $logfile" >> $check_logfile -else - echo "[${check_curdate}]: Server running" >> $check_logfile -fi diff --git a/SAS/OTB/scripts/src/startOTB b/SAS/OTB/scripts/src/startOTB deleted file mode 100755 index d72e3a7875751f58907ad735f29fee0e13fc146f..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/startOTB +++ /dev/null @@ -1,17 +0,0 @@ -export serverDir=/opt/sas/server -export clientDir=/opt/sas/client -export JAVAHOME=/usr/java/jdk1.6.0_07 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir - -serverpid=0 -ps -ef | grep -v grep | grep server | grep java | grep 11500 2>&1 1>/dev/null -if [ $? -ne 0 ]; then - echo "starting server first" - curdate=`date +%Y%m%dT%H%M%S` - $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11500 11501 2>&1 1>/opt/lofar/var/log/OTBServer.$curdate & - serverpid=$! -fi - -curdate=`date +%Y%m%dT%H%M%S` -$JAVAHOME/bin/java -jar $clientDir/OTB.jar -p 11500 2>&1 1>/opt/lofar/var/log/OTB.$curdate & - diff --git a/SAS/OTB/scripts/src/startOTBServer b/SAS/OTB/scripts/src/startOTBServer deleted file mode 100755 index 1e74a60a26a81fa40a225afa9a0889c83f41331c..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/startOTBServer +++ /dev/null @@ -1,14 +0,0 @@ -export serverDir=/opt/sas/server -export JAVAHOME=/usr/java/jdk1.6.0_07 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir - -serverpid=0 -ps -ef | grep -v grep | grep server | grep java | grep 11500 2>&1 1>/dev/null -if [ $? -ne 0 ]; then - echo "starting server" - curdate=`date +%Y%m%dT%H%M%S` - $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11500 11501 2>&1 1>/opt/lofar/var/log/OTBServer.$curdate & -else - echo "Server already running; kill first!" - exit -fi diff --git a/SAS/OTB/scripts/src/startOTBTest b/SAS/OTB/scripts/src/startOTBTest deleted file mode 100755 index 2b231cc251abf864148e69ca9947aedcfb0938dc..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/startOTBTest +++ /dev/null @@ -1,15 +0,0 @@ -export serverDir=/opt/sas/server -export clientDir=/opt/sas/client -export JAVAHOME=/usr/java/jdk1.6.0_07 -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$serverDir - -serverpid=0 -ps -ef | grep -v grep | grep java | grep 11510 2>&1 1>/dev/null -if [ $? -ne 0 ]; then - $JAVAHOME/bin/java -jar $serverDir/jOTDB3.jar sas001.control.lofar sas001.control.lofar 11510 11511 & - serverpid=$! -fi - - -$JAVAHOME/bin/java -jar $clientDir/OTB.jar -p 11510 - diff --git a/SAS/OTB/scripts/src/stopOTBServer b/SAS/OTB/scripts/src/stopOTBServer deleted file mode 100755 index 592b7b02f157f89ebbf78ef243dce184aa91c4ca..0000000000000000000000000000000000000000 --- a/SAS/OTB/scripts/src/stopOTBServer +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Script to stop running OTB server -# - -serverpid=`ps -eaf | grep 11500 | grep server | awk '{print $2}'` - -if [ "$serverpid" != "" ]; then - echo "Found OTB server process with PID: "$serverpid - kill $serverpid - serverpid=`ps -eaf | grep 11500 | grep server | awk '{print $2}'` - if [ "$serverpid" != "" ]; then - echo "Could not stop server; try manually" - else - echo "Server stopped" - fi -fi -