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.


git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@570633 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hbase/CHANGES.txt

@@ -22,6 +22,7 @@ Trunk (unreleased changes)
     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

src/contrib/hbase/bin/hbase

@@ -127,12 +127,9 @@ fi
 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