You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2014/11/19 05:39:15 UTC
incubator-lens git commit: LENS-22 : Fix lens server classpath not
have any wildcard characters
Repository: incubator-lens
Updated Branches:
refs/heads/master d34a8f7b9 -> 7bc8b978c
LENS-22 : Fix lens server classpath not have any wildcard characters
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/7bc8b978
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/7bc8b978
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/7bc8b978
Branch: refs/heads/master
Commit: 7bc8b978c8dd262176bc6d294de6150f07083868
Parents: d34a8f7
Author: Amareshwari Sriramdasu <am...@inmobi.com>
Authored: Wed Nov 19 10:09:03 2014 +0530
Committer: Amareshwari Sriramdasu <am...@inmobi.com>
Committed: Wed Nov 19 10:09:03 2014 +0530
----------------------------------------------------------------------
tools/scripts/lens-config.sh | 7 ++++---
tools/scripts/lens-ctl | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7bc8b978/tools/scripts/lens-config.sh
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-config.sh b/tools/scripts/lens-config.sh
index 37b4e8e..8bd9013 100644
--- a/tools/scripts/lens-config.sh
+++ b/tools/scripts/lens-config.sh
@@ -81,7 +81,7 @@ shift
case $type in
client)
# set the client class path
- LENSCPPATH="$LENS_CONF:${BASEDIR}/lib/*"
+ LENSCPPATH=$LENS_CONF:`ls ${BASEDIR}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
LENS_OPTS="$LENS_OPTS $LENS_CLIENT_OPTS $LENS_CLIENT_HEAP"
LENS_LOG_DIR="${LENS_LOG_DIR:-$BASEDIR/logs}"
export LENS_LOG_DIR
@@ -101,9 +101,10 @@ case $type in
cd -
fi
LENSCPPATH="${LENSCPPATH}:${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/classes"
- LENSCPPATH="${LENSCPPATH}:${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/lib/*:${BASEDIR}/lib/*"
+ LENSCPPATH=${LENSCPPATH}:`ls ${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
+ LENSCPPATH=${LENSCPPATH}:`ls ${BASEDIR}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
- HADOOP_CLASSPATH="$HADOOP_CLASSPATH:${LENS_EXPANDED_WEBAPP_DIR}/lens-server/WEB-INF/lib/*"
+ HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${LENSCPPATH}
export HADOOP_CLASSPATH
# log and pid dirs for applications
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/7bc8b978/tools/scripts/lens-ctl
----------------------------------------------------------------------
diff --git a/tools/scripts/lens-ctl b/tools/scripts/lens-ctl
index 49b89b7..005ba04 100755
--- a/tools/scripts/lens-ctl
+++ b/tools/scripts/lens-ctl
@@ -120,7 +120,7 @@ start() {
if [ "$HIVE_HOME" != "" ]; then
echo "HIVE_HOME is set, adding ${HIVE_HOME}/lib/* into lens classpath"
- LENSCPPATH="${LENSCPPATH}:${HIVE_HOME}/lib/*"
+ LENSCPPATH=${LENSCPPATH}:`ls ${HIVE_HOME}/lib/* 2>/dev/null | tr "\n" ':' 2>/dev/null`
else
echo "HIVE_HOME is not set. Set HIVE_HOME and try again"
exit 1