From d7e6fd82926b52ecc7a65bf95753e0e3525e16ce Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 26 Apr 2017 23:48:34 +0800 Subject: [PATCH] HBASE-15199 --- bin/hbase | 5 +++++ bin/hbase.cmd | 5 +++++ hbase-assembly/src/main/assembly/hadoop-two-compat.xml | 18 +++++++++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/bin/hbase b/bin/hbase index f1114af059..3a3562161d 100755 --- a/bin/hbase +++ b/bin/hbase @@ -295,6 +295,11 @@ fi # figure out which class to run if [ "$COMMAND" = "shell" ] ; then + # Add all jars under $HBASE_HOME/lib/ruby (currently jruby-complete) to CLASSPATH only when hbase shell + for f in $HBASE_HOME/lib/ruby/*.jar; do + CLASSPATH=${CLASSPATH}:$f; + done + # eg export JRUBY_HOME=/usr/local/share/jruby if [ "$JRUBY_HOME" != "" ] ; then CLASSPATH="$JRUBY_HOME/lib/jruby.jar:$CLASSPATH" diff --git a/bin/hbase.cmd b/bin/hbase.cmd index 57a0cb4609..bb336acfbb 100644 --- a/bin/hbase.cmd +++ b/bin/hbase.cmd @@ -307,6 +307,11 @@ endlocal goto :eof :shell + @rem Add all jars under %HBASE_HOME%\lib\ruby (currently jruby-compelte) to CLASSPATH only when hbase shell + if exist "%HBASE_HOME%\lib\ruby" ( + set CLASSPATH=!CLASSPATH!;%HBASE_HOME%\lib\ruby\*.jar + ) + rem eg export JRUBY_HOME=/usr/local/share/jruby if defined JRUBY_HOME ( set CLASSPATH=%CLASSPATH%;%JRUBY_HOME%\lib\jruby.jar diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index 894ca67cd7..4895588dd9 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -55,7 +55,12 @@ lib false - + + + + org.jruby:jruby-complete + + @@ -81,4 +86,15 @@ unix + + + + + lib/ruby + + org.jruby:jruby-complete + + + + -- 2.11.0 (Apple Git-81)