hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1242027 - /hbase/trunk/bin/hbase
Date Wed, 08 Feb 2012 18:11:09 GMT
Author: stack
Date: Wed Feb  8 18:11:08 2012
New Revision: 1242027

URL: http://svn.apache.org/viewvc?rev=1242027&view=rev
Log:
HBASE-5221 bin/hbase script doesn't look for Hadoop jars in the right place in trunk layout
-- REVERTED

Modified:
    hbase/trunk/bin/hbase

Modified: hbase/trunk/bin/hbase
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase?rev=1242027&r1=1242026&r2=1242027&view=diff
==============================================================================
--- hbase/trunk/bin/hbase (original)
+++ hbase/trunk/bin/hbase Wed Feb  8 18:11:08 2012
@@ -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



Mime
View raw message