svn commit: r886310 - in /incubator/cassandra/trunk/bin: json2sstable nodeprobe sstable2json

[eevans]

Author: eevans
Date: Wed Dec  2 21:29:41 2009
New Revision: 886310

URL: http://svn.apache.org/viewvc?rev=886310&view=rev
Log:
use JAVA_HOME if set for all unix run scripts

Patch by Kay Kay; reviewed by eevans for CASSANDRA-590

Modified:
    incubator/cassandra/trunk/bin/json2sstable
    incubator/cassandra/trunk/bin/nodeprobe
    incubator/cassandra/trunk/bin/sstable2json

Modified: incubator/cassandra/trunk/bin/json2sstable
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/json2sstable?rev=886310&r1=886309&r2=886310&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/json2sstable (original)
+++ incubator/cassandra/trunk/bin/json2sstable Wed Dec  2 21:29:41 2009
@@ -31,12 +31,19 @@
     . $CASSANDRA_INCLUDE
 fi
 
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA=`which java`
+fi
+
 if [ -z $CLASSPATH ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
 
-java -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+$JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
         org.apache.cassandra.tools.SSTableImport "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

Modified: incubator/cassandra/trunk/bin/nodeprobe
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/nodeprobe?rev=886310&r1=886309&r2=886310&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/nodeprobe (original)
+++ incubator/cassandra/trunk/bin/nodeprobe Wed Dec  2 21:29:41 2009
@@ -30,6 +30,13 @@
     . $CASSANDRA_INCLUDE
 fi
 
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA=`which java`
+fi
+
 if [ -z $CASSANDRA_CONF -o -z $CLASSPATH ]; then
     echo "You must set the CASSANDRA_CONF and CLASSPATH vars" >&2
     exit 1
@@ -43,7 +50,7 @@
     ;;
 esac
 
-java -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
+$JAVA -cp $CLASSPATH -Dstorage-config=$CASSANDRA_CONF \
         org.apache.cassandra.tools.NodeProbe $@
 
 # vi:ai sw=4 ts=4 tw=0 et

Modified: incubator/cassandra/trunk/bin/sstable2json
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/sstable2json?rev=886310&r1=886309&r2=886310&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/sstable2json (original)
+++ incubator/cassandra/trunk/bin/sstable2json Wed Dec  2 21:29:41 2009
@@ -31,12 +31,20 @@
     . $CASSANDRA_INCLUDE
 fi
 
+
+# Use JAVA_HOME if set, otherwise look for java in PATH
+if [ -x $JAVA_HOME/bin/java ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA=`which java`
+fi
+
 if [ -z $CLASSPATH ]; then
     echo "You must set the CLASSPATH var" >&2
     exit 1
 fi
 
-java -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
+$JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
         org.apache.cassandra.tools.SSTableExport "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et