From ec7daf94139d559f0fabc624eb500bc43ae89460 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 8 Feb 2012 18:11:08 +0000
Subject: [PATCH] HBASE-5221 bin/hbase script doesn't look for Hadoop jars in
 the right place in trunk layout -- REVERTED

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1242027 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/hbase | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bin/hbase b/bin/hbase
index e6bc2910d49..c5692ffb746 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -227,15 +227,13 @@ if [ ! -z $HADOOP_HOME ]; then
   if [ "`echo ${HADOOP_HOME}/hadoop-core*.jar`" != "${HADOOP_HOME}/hadoop-core*.jar" ] ; then
     HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-core*.jar | head -1`)
   else
-    HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/share/hadoop/common/hadoop-common*.jar | head -1`)
-    HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/share/hadoop/hdfs/hadoop-hdfs*.jar | head -1`)
+    HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-common*.jar | head -1`)
+    HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-hdfs*.jar | head -1`)
+    HADOOPCPPATH=$(append_path "${HADOOPCPPATH}" `ls ${HADOOP_HOME}/hadoop-mapred*.jar | head -1`)
   fi
   for i in "${HADOOP_HOME}/lib/"*.jar; do
     HADOOPCPPATH="${HADOOPCPPATH}:$i"
   done
-  if [ -d "${HADOOP_HOME}/share/hadoop/common/lib" ]; then
-    HADOOPCPPATH=${HADOOPCPPATH}:${HADOOP_HOME}/share/hadoop/common/lib'/*'
-  fi
   CLASSPATH=$(append_path "${CLASSPATH}" "${HADOOPCPPATH}")
   
   if [ -d "${HADOOP_HOME}/lib/native" ]; then