From d6bebca40755b6ab3ca283b92db4a496a0def8f1 Mon Sep 17 00:00:00 2001
From: Arno Schoenmakers <schoenmakers@astron.nl>
Date: Tue, 10 Sep 2013 07:02:24 +0000
Subject: [PATCH] Task #1418: Cleanup of obsoleted functionality
---
.gitattributes | 7 -------
.gitignore | 3 ---
SAS/OTB/scripts/CMakeLists.txt | 3 ---
SAS/OTB/scripts/src/CMakeLists.txt | 9 ---------
SAS/OTB/scripts/src/checkOTDBServer | 25 -------------------------
SAS/OTB/scripts/src/startOTB | 17 -----------------
SAS/OTB/scripts/src/startOTBServer | 14 --------------
SAS/OTB/scripts/src/startOTBTest | 15 ---------------
SAS/OTB/scripts/src/stopOTBServer | 18 ------------------
9 files changed, 111 deletions(-)
delete mode 100644 SAS/OTB/scripts/CMakeLists.txt
delete mode 100644 SAS/OTB/scripts/src/CMakeLists.txt
delete mode 100755 SAS/OTB/scripts/src/checkOTDBServer
delete mode 100755 SAS/OTB/scripts/src/startOTB
delete mode 100755 SAS/OTB/scripts/src/startOTBServer
delete mode 100755 SAS/OTB/scripts/src/startOTBTest
delete mode 100755 SAS/OTB/scripts/src/stopOTBServer
diff --git a/.gitattributes b/.gitattributes
index 954342ff2ca..80b5d1302c7 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 965ea868746..4b712244683 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 1347f939ceb..00000000000
--- 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 74c8c7deef5..00000000000
--- 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 d8fc183332e..00000000000
--- 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 d72e3a78757..00000000000
--- 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 1e74a60a26a..00000000000
--- 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 2b231cc251a..00000000000
--- 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 592b7b02f15..00000000000
--- 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
-
--
GitLab