QPID-1243 : Applied patch from Robert Gemmell. Took a different approach for the linux binaries as the provided binaries requried a newer libc than I have. Also restored the qpidversion.properties file generation for this module that

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@720931 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 41 insertions, 31 deletions

diff --git a/java/management/eclipse-plugin/bin/qpidmc.sh b/java/management/eclipse-plugin/bin/qpidmc.sh
index 2472545a14..599d9bf7e0 100755
--- a/java/management/eclipse-plugin/bin/qpidmc.sh
+++ b/java/management/eclipse-plugin/bin/qpidmc.sh
@@ -18,14 +18,13 @@
 # under the License.
 #
 
-if [ "$JAVA_HOME" == "" ]; then
-    echo "The JAVA_HOME environment variable is not defined";
-    exit 0;
+if [ -z "$JAVA" ]; then
+    JAVA=java
 fi
 
-if [ "$QPIDMC_HOME" == "" ]; then
-    echo "The QPIDMC_HOME environment variable is not defined correctly";
-    exit 0;
+if [ -z "$QPIDMC_HOME" ]; then
+    export QPIDMC_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPIDMC_HOME}/bin
 fi
 
 # Test if we're running on cygwin.
@@ -38,27 +37,39 @@ if $cygwin; then
   QPIDMC_HOME=$(cygpath -w $QPIDMC_HOME)
 fi
 
-os=win32
-ws=win32
-arch=x86
-
-##echo $os
-##echo $ws
-##echo $arch
 
 ## If this is to be run on different platform other than windows then following parameters should be passed
-## qpidmc.sh <operating system> <windowing system> <platform achitecture>
-## eg. qpidmc.sh linux motif x86
-if [ $# -eq 3 ]; then
-    os=$1
-    ws=$2
-    arch=$3
+## qpidmc.sh <windowing system>
+## eg. qpidmc.sh motif
+
+if [ $# -eq 1 ] ; then
+    QPIDMC_WS=$1
+else
+    # If the WS is not set via QPIDMC_WS then query uname for the WS
+    if [ -z "$QPIDMC_WS" ] ; then
+       echo "Usage qpidmc.sh <windowing system>
+       echo "Alternatively set QPIDMC_WS to the windowing system you wish to use
+       exit 1
+    fi
+fi
+
+# If the OS is not set via QPIDMC_OS then query uname for the OS
+if [ -z "$QPIDMC_OS" ] ; then
+    QPIDMC_OS=`uname | tr A-Z a-z`
+else
+    # Force OS to be lower case
+    QPIDMC_OS=`echo $QPIDMC_OS | tr A-Z a-z`
 fi
 
-if [ $os = "SunOS" ]; then
-    os="solaris"
-elif [ $os = "Linux" ]; then
-    os="linux"
+# If the ARCH is not set via QPIDMC_ARCH then query uname for the arch,
+if [ -z "$QPIDMC_ARCH" ] ; then
+    QPIDMC_ARCH=`uname -i`
 fi
 
-"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch
+# Note that it sometimes returns i386 which needs to be changed to x86
+if [ "$QPIDMC_ARCH" == "i386" ] ; then
+    QPIDMC_ARCH="x86"
+fi
+
+
+"$JAVA" -Xms40m -Xmx256m -Declipse.consoleLog=true -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $QPIDMC_OS -ws $QPIDMC_WS -arch $QPIDMC_ARCH
diff --git a/java/management/eclipse-plugin/bin/qpidmc_gtk.sh b/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
index 10b463d63b..1d55743d84 100755
--- a/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
+++ b/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
@@ -18,7 +18,9 @@
 # under the License.
 #
 
-os=`uname | tr A-Z a-z`
-arch=`uname -p`
+if [ -z "$QPIDMC_HOME" ]; then
+    export QPIDMC_HOME=$(dirname $(dirname $(readlink -f $0)))
+    export PATH=${PATH}:${QPIDMC_HOME}/bin
+fi
 
-$QPIDMC_HOME/bin/qpidmc.sh $os gtk $arch
+$QPIDMC_HOME/bin/qpidmc.sh gtk
diff --git a/java/management/eclipse-plugin/bin/qpidmc_motif.sh b/java/management/eclipse-plugin/bin/qpidmc_motif.sh
index f53be75d87..f49759cc91 100755
--- a/java/management/eclipse-plugin/bin/qpidmc_motif.sh
+++ b/java/management/eclipse-plugin/bin/qpidmc_motif.sh
@@ -18,7 +18,4 @@
 # under the License.
 #
 
-os=`uname | tr A-Z a-z`
-arch=`uname -p`
-
-$QPIDMC_HOME/bin/qpidmc.sh $os motif $arch
+$QPIDMC_HOME/bin/qpidmc.sh motif