Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2111 Move to ivy broke our being able to run in-place; i.e. ./bin/start-hbase.sh in a checkout 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@898132 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-01-12 00:23:42 +00:00
parent 704b52fbe9
commit 05e631f7d9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -293,6 +293,8 @@ Release 0.21.0 - Unreleased
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

17
bin/hbase
View File

@ -86,11 +86,9 @@ IFS=
# 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 @@ for f in $HBASE_HOME/lib/*.jar; do
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"