8 files changed, 84 insertions, 6 deletions
diff --git a/qpid/tools/src/java/bin/ConnectionAudit.sh b/qpid/tools/src/java/bin/ConnectionAudit.sh
index b2f494c025..8675a49c14 100755
--- a/qpid/tools/src/java/bin/ConnectionAudit.sh
+++ b/qpid/tools/src/java/bin/ConnectionAudit.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/ConnectionLogger.sh b/qpid/tools/src/java/bin/ConnectionLogger.sh
index da4474d48e..9a78b66fbe 100755
--- a/qpid/tools/src/java/bin/ConnectionLogger.sh
+++ b/qpid/tools/src/java/bin/ConnectionLogger.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/QpidConfig.sh b/qpid/tools/src/java/bin/QpidConfig.sh
index 16177aed24..109daa2f04 100755
--- a/qpid/tools/src/java/bin/QpidConfig.sh
+++ b/qpid/tools/src/java/bin/QpidConfig.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/QpidCtrl.sh b/qpid/tools/src/java/bin/QpidCtrl.sh
index e0086fb0cf..95e41ec030 100755
--- a/qpid/tools/src/java/bin/QpidCtrl.sh
+++ b/qpid/tools/src/java/bin/QpidCtrl.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/QpidPrintEvents.sh b/qpid/tools/src/java/bin/QpidPrintEvents.sh
index c8f17e2906..313c6b2938 100755
--- a/qpid/tools/src/java/bin/QpidPrintEvents.sh
+++ b/qpid/tools/src/java/bin/QpidPrintEvents.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/QpidQueueStats.sh b/qpid/tools/src/java/bin/QpidQueueStats.sh
index a233d0ba49..cf41bd4101 100755
--- a/qpid/tools/src/java/bin/QpidQueueStats.sh
+++ b/qpid/tools/src/java/bin/QpidQueueStats.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL
diff --git a/qpid/tools/src/java/bin/QpidRestAPI.sh b/qpid/tools/src/java/bin/QpidRestAPI.sh
index 56c0854b4a..7b1dd77b54 100755
--- a/qpid/tools/src/java/bin/QpidRestAPI.sh
+++ b/qpid/tools/src/java/bin/QpidRestAPI.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,12 +33,7 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar:$QMF2_LIBS/restapi.jar
 
-# Add Cygwin support.
-cygwin=false;
-case "`uname`" in
-  CYGWIN*) cygwin=true;;
-esac
-
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
 if $cygwin; then
   CLASSPATH=$(cygpath -wp $CLASSPATH)
 fi
diff --git a/qpid/tools/src/java/bin/QueueFuse.sh b/qpid/tools/src/java/bin/QueueFuse.sh
index 4e51731412..0fa1dd19fb 100755
--- a/qpid/tools/src/java/bin/QueueFuse.sh
+++ b/qpid/tools/src/java/bin/QueueFuse.sh
@@ -18,6 +18,12 @@
 # under the License.
 #
 
+# Test if we're running on Cygwin.
+cygwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true;;
+esac
+
 WHEREAMI=`dirname $0`
 if [ -z "$QMF2_HOME" ]; then
     export QMF2_HOME=`cd $WHEREAMI/../ && pwd`
@@ -27,6 +33,11 @@ QMF2_LIBS=$QMF2_HOME/build/lib
 
 CLASSPATH=$QMF2_LIBS/qpid-client-patch.jar:$CLASSPATH:$QMF2_LIBS/qmf2.jar
 
+# If we're on Cygwin we need to prepend the CLASSPATH with cygpath.
+if $cygwin; then
+  CLASSPATH=$(cygpath -wp $CLASSPATH)
+fi
+
 # Get the log level from the AMQJ_LOGGING_LEVEL environment variable.
 if [ -n "$AMQJ_LOGGING_LEVEL" ]; then
     PROPERTIES=-Damqj.logging.level=$AMQJ_LOGGING_LEVEL