From 47587a272f7226691ac17d617f4aa57a4a0b0805 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 29 Aug 2007 04:30:58 +0000
Subject: [PATCH] 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/src/contrib/hbase@570633 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt | 1 +
 bin/hbase   | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f2dbccd9485..9e019bfe49b 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/bin/hbase b/bin/hbase
index 25558033fd0..9848caa33b1 100755
--- a/bin/hbase
+++ b/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