qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fad...@apache.org
Subject svn commit: r1576020 - in /qpid/trunk/qpid/tools/src/java/bin: ConnectionAudit.sh ConnectionLogger.sh QpidConfig.sh QpidCtrl.sh QpidPrintEvents.sh QpidQueueStats.sh QpidRestAPI.sh QueueFuse.sh
Date Mon, 10 Mar 2014 17:55:05 GMT
Author: fadams
Date: Mon Mar 10 17:55:05 2014
New Revision: 1576020

URL: http://svn.apache.org/r1576020
Log:
QPID-5604: Added Cygwin support to all the scripts in qpid/tools/src/java/bin

Modified:
    qpid/trunk/qpid/tools/src/java/bin/ConnectionAudit.sh
    qpid/trunk/qpid/tools/src/java/bin/ConnectionLogger.sh
    qpid/trunk/qpid/tools/src/java/bin/QpidConfig.sh
    qpid/trunk/qpid/tools/src/java/bin/QpidCtrl.sh
    qpid/trunk/qpid/tools/src/java/bin/QpidPrintEvents.sh
    qpid/trunk/qpid/tools/src/java/bin/QpidQueueStats.sh
    qpid/trunk/qpid/tools/src/java/bin/QpidRestAPI.sh
    qpid/trunk/qpid/tools/src/java/bin/QueueFuse.sh

Modified: qpid/trunk/qpid/tools/src/java/bin/ConnectionAudit.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/ConnectionAudit.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/ConnectionAudit.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/ConnectionAudit.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/ConnectionLogger.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/ConnectionLogger.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/ConnectionLogger.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/ConnectionLogger.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QpidConfig.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QpidConfig.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QpidConfig.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QpidConfig.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QpidCtrl.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QpidCtrl.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QpidCtrl.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QpidCtrl.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QpidPrintEvents.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QpidPrintEvents.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QpidPrintEvents.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QpidPrintEvents.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QpidQueueStats.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QpidQueueStats.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QpidQueueStats.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QpidQueueStats.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QpidRestAPI.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QpidRestAPI.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QpidRestAPI.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QpidRestAPI.sh Mon Mar 10 17:55:05 2014
@@ -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

Modified: qpid/trunk/qpid/tools/src/java/bin/QueueFuse.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/java/bin/QueueFuse.sh?rev=1576020&r1=1576019&r2=1576020&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/java/bin/QueueFuse.sh (original)
+++ qpid/trunk/qpid/tools/src/java/bin/QueueFuse.sh Mon Mar 10 17:55:05 2014
@@ -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



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message