hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r919083 - in /hadoop/hbase/trunk: CHANGES.txt bin/hbase
Date Thu, 04 Mar 2010 17:43:05 GMT
Author: stack
Date: Thu Mar  4 17:43:05 2010
New Revision: 919083

URL: http://svn.apache.org/viewvc?rev=919083&view=rev
Log:
HBASE-2281  Hbase shell does not work when started from the build dir

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/bin/hbase

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=919083&r1=919082&r2=919083&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Mar  4 17:43:05 2010
@@ -223,6 +223,8 @@
                (Kannan Muthukkaruppan via Stack)
    HBASE-2063  For hfileoutputformat, on timeout/failure/kill clean up
                half-written hfile (Ruslan Salyakhov via Stack)
+   HBASE-2281  Hbase shell does not work when started from the build dir
+               (Alexey Kovyrin via Stack)
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=919083&r1=919082&r2=919083&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Thu Mar  4 17:43:05 2010
@@ -99,6 +99,19 @@
   CLASSPATH=${CLASSPATH}:$HBASE_HOME/build
 fi
 
+# Add maven target directory
+if [ -f $HBASE_HOME/pom.xml ]; then
+  HBASE_VER=`grep '<version>' $HBASE_HOME/pom.xml | head -1 | sed 's/.*<version>\(.*\)<\/version>/\1/'`
+  MAVEN_TARGET_DIR=$HBASE_HOME/target/hbase-$HBASE_VER-bin/hbase-$HBASE_VER
+  if [ -d "$MAVEN_TARGET_DIR" ]; then
+    for f in $MAVEN_TARGET_DIR/*.jar $MAVEN_TARGET_DIR/lib/*.jar; do
+      if [ -f $f ]; then
+        CLASSPATH=${CLASSPATH}:$f;
+      fi
+    done
+  fi
+fi
+
 # For releases, add hbase & webapps to CLASSPATH
 # Webapps must come first else it messes up Jetty
 if [ -d "$HBASE_HOME/webapps" ]; then



Mime
View raw message