svn commit: r898132 - in /hadoop/hbase/trunk: CHANGES.txt bin/hbase

[st...@apache.org]

Author: stack
Date: Tue Jan 12 00:23:42 2010
New Revision: 898132

URL: http://svn.apache.org/viewvc?rev=898132&view=rev
Log:
HBASE-2111 Move to ivy broke our being able to run in-place; i.e. ./bin/start-hbase.sh in a checkout

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=898132&r1=898131&r2=898132&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jan 12 00:23:42 2010
@@ -293,6 +293,8 @@
    HBASE-2095  TIF shuold support more confs for the scanner (Bassam Tabbara
                via Andrew Purtell)
    HBASE-2107  Upgrading Lucene 2.2 to Lucene 3.0.0 (Kay Kay via Stack)
+   HBASE-2111  Move to ivy broke our being able to run in-place; i.e.
+               ./bin/start-hbase.sh in a checkout
 
   NEW FEATURES
    HBASE-1901  "General" partitioner for "hbase-48" bulk (behind the api, write

Modified: hadoop/hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/hbase?rev=898132&r1=898131&r2=898132&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/hbase (original)
+++ hadoop/hbase/trunk/bin/hbase Tue Jan 12 00:23:42 2010
@@ -86,11 +86,9 @@
 
 # CLASSPATH initially contains $HBASE_CONF_DIR
 CLASSPATH="${HBASE_CONF_DIR}"
-
-
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
-# for developers, add hbase classes to CLASSPATH
+# For developers, add hbase classes to CLASSPATH
 if [ -d "$HBASE_HOME/build/classes" ]; then
   CLASSPATH=${CLASSPATH}:$HBASE_HOME/build/classes
 fi
@@ -117,15 +115,24 @@
   CLASSPATH=${CLASSPATH}:$f;
 done
 
-for f in $HBASE_HOME/lib/jsp-2.1/*.jar; do
+# Add libs handled by ivy
+if [ -d "$HBASE_HOME/build/ivy/lib/common" ]; then
+for f in $HBASE_HOME/build/ivy/lib/common/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
+fi
+if [ -d "$HBASE_HOME/build/ivy/lib/test" ]; then
+for f in $HBASE_HOME/build/ivy/lib/test/*.jar; do
+  CLASSPATH=${CLASSPATH}:$f;
+done
+fi
 
-# add user-specified CLASSPATH last
+# Add user-specified CLASSPATH last
 if [ "$HBASE_CLASSPATH" != "" ]; then
   CLASSPATH=${CLASSPATH}:${HBASE_CLASSPATH}
 fi
 
+
 # default log directory & file
 if [ "$HBASE_LOG_DIR" = "" ]; then
   HBASE_LOG_DIR="$HBASE_HOME/logs"