Author: stack
Date: Tue Aug 28 21:30:58 2007
New Revision: 570633
URL: http://svn.apache.org/viewvc?rev=570633&view=rev
Log:
HADOOP-1799 Incorrect classpath in binary version of Hadoop
M bin/hbase
Had a hard-coded name for the hbase jar. Fix so allows
for version in jar name.
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=570633&r1=570632&r2=570633&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Tue Aug 28 21:30:58 2007
@@ -22,6 +22,7 @@
compaction result
HADOOP-1780 Regions are still being doubly assigned
HADOOP-1797 Fix NPEs in MetaScanner constructor
+ HADOOP-1799 Incorrect classpath in binary version of Hadoop
IMPROVEMENTS
HADOOP-1737 Make HColumnDescriptor data publically members settable
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase?rev=570633&r1=570632&r2=570633&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase Tue Aug 28 21:30:58 2007
@@ -127,12 +127,9 @@
IFS=
# for releases, add core hbase, hadoop jar & webapps to CLASSPATH
-for f in "$HBASE_HOME/hadoop-hbase-*.jar"; do
+for f in $HADOOP_HOME/contrib/hadoop-*-hbase*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
-if [ -f "$HADOOP_HOME/contrib/hadoop-hbase.jar" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_HOME/contrib/hadoop-hbase.jar
-fi
if [ -d "$HADOOP_HOME/webapps" ]; then
CLASSPATH=${CLASSPATH}:$HADOOP_HOME
fi
