diff options
| author | Keith Wall <kwall@apache.org> | 2012-02-06 11:41:54 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2012-02-06 11:41:54 +0000 |
| commit | a781ea44c5b6788a72a7066e0ee5108929b6a1f4 (patch) | |
| tree | f78467878bc46c02a114a177601f0085144ed65b | |
| parent | d49a0cdf6e0a69f7b47df4c0f98e84c2ba33eff9 (diff) | |
| download | qpid-python-a781ea44c5b6788a72a7066e0ee5108929b6a1f4.tar.gz | |
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@1240985 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/java/bdbstore/bin/backup.sh | 6 | ||||
| -rwxr-xr-x | qpid/java/bdbstore/bin/storeUpgrade.sh | 6 | ||||
| -rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/qpid/java/bdbstore/bin/backup.sh b/qpid/java/bdbstore/bin/backup.sh index f9e9dc73d2..0fa1d57392 100755 --- a/qpid/java/bdbstore/bin/backup.sh +++ b/qpid/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/qpid/java/bdbstore/bin/storeUpgrade.sh b/qpid/java/bdbstore/bin/storeUpgrade.sh index 0fb9d4cda6..4c13f8d178 100755 --- a/qpid/java/bdbstore/bin/storeUpgrade.sh +++ b/qpid/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/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java index 96afa83a7d..9b97fec479 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java +++ b/qpid/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) |