From 441e91e317d136bde8ebff6fdbbeaf9214087688 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 23 Oct 2007 15:48:40 +0000 Subject: [PATCH] Merged in from DEV trunk... --- bin/luceneserver/ktlucene.jar | Bin 12376 -> 0 bytes examples/linux/init/dmsctl.sh | 16 +++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/luceneserver/ktlucene.jar b/bin/luceneserver/ktlucene.jar index 394422a..e57e1b3 100644 Binary files a/bin/luceneserver/ktlucene.jar and b/bin/luceneserver/ktlucene.jar differ diff --git a/examples/linux/init/dmsctl.sh b/examples/linux/init/dmsctl.sh index cc06682..7fb6885 100644 --- a/examples/linux/init/dmsctl.sh +++ b/examples/linux/init/dmsctl.sh @@ -467,28 +467,26 @@ start_scheduler() { fi } -stop_xvfb() { -if [ $USEXVFB -eq 1 ]; then +stop_scheduler() { NO_EXIT_ON_ERROR=$1 - is_xvfb_running + is_scheduler_running RUNNING=$? if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $XVFB_STATUS" + echo "$0 $ARG: $SCHEDULER_STATUS" if [ "x$NO_EXIT_ON_ERROR" != "xno_exit" ]; then exit else return fi fi - get_xvfb_pid - if killall $XVFBBIN ; then - echo "$0 $ARG: Xvfb stopped" + get_scheduler_pid + if killall $SCHEDULERBIN ; then + echo "$0 $ARG: schedulerstopped" else - echo "$0 $ARG: Xvfb could not be stopped" + echo "$0 $ARG: scheduler could not be stopped" ERROR=4 fi -fi } help() { -- libgit2 0.21.4