From e3e76f006919efb925dcdf24cb197f4d73f9a26d Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 6 Feb 2012 11:41:54 +0000
Subject: QPID-3775: Change BDB shell scripts to avoid use of readlink when
 determining QPID_HOME.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1240985 13f79535-47bb-0310-9956-ffa450edef68
---
 java/bdbstore/bin/backup.sh                                        | 6 +++---
 java/bdbstore/bin/storeUpgrade.sh                                  | 6 +++---
 .../java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java    | 7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'java')

diff --git a/java/bdbstore/bin/backup.sh b/java/bdbstore/bin/backup.sh
index f9e9dc73d2..0fa1d57392 100755
--- a/java/bdbstore/bin/backup.sh
+++ b/java/bdbstore/bin/backup.sh
@@ -29,9 +29,9 @@ for arg in "$@"; do
     fi
 done
 
-if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+if [ -z "${QPID_HOME}" ]; then
+    WHEREAMI=`dirname "$0"`
+    export QPID_HOME=`cd ${WHEREAMI}/../ && pwd`
 fi
 
 VERSION=0.15
diff --git a/java/bdbstore/bin/storeUpgrade.sh b/java/bdbstore/bin/storeUpgrade.sh
index 0fb9d4cda6..4c13f8d178 100755
--- a/java/bdbstore/bin/storeUpgrade.sh
+++ b/java/bdbstore/bin/storeUpgrade.sh
@@ -28,9 +28,9 @@ for arg in "$@"; do
     fi
 done
 
-if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
+if [ -z "${QPID_HOME}" ]; then
+    WHEREAMI=`dirname "$0"`
+    export QPID_HOME=`cd ${WHEREAMI}/../ && pwd`
 fi
 
 VERSION=0.15
diff --git a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
index 96afa83a7d..9b97fec479 100644
--- a/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
+++ b/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
@@ -129,7 +129,12 @@ public class BDBBackup
 
             if (log.isInfoEnabled())
             {
-                log.info("BDBBackup Utility: Hot Backup Completed. Files backed up: " + backedUpFiles);
+                log.info("BDBBackup Utility: Hot Backup Completed.");
+                log.info(backedUpFiles.length + " file(s) backed-up:");
+                for(String backedUpFile : backedUpFiles)
+                {
+                    log.info(backedUpFile);
+                }
             }
         }
         catch (Exception e)
-- 
cgit v1.2.1