Author: kwall
Date: Mon Feb 6 11:41:54 2012
New Revision: 1240985
URL: http://svn.apache.org/viewvc?rev=1240985&view=rev
Log:
QPID-3775: Change BDB shell scripts to avoid use of readlink when determining
QPID_HOME.
Modified:
qpid/trunk/qpid/java/bdbstore/bin/backup.sh
qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
Modified: qpid/trunk/qpid/java/bdbstore/bin/backup.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/backup.sh?rev=1240985&r1=1240984&r2=1240985&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/backup.sh Mon Feb 6 11:41:54 2012
@@ -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
Modified: qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh?rev=1240985&r1=1240984&r2=1240985&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh Mon Feb 6 11:41:54 2012
@@ -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
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java?rev=1240985&r1=1240984&r2=1240985&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
Mon Feb 6 11:41:54 2012
@@ -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)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
