Repository: falcon Updated Branches: refs/heads/0.10 2e986a3c6 -> c9e93162a
FALCON-2061 Falcon CLI shows hadoop classpath loading info in the console Author: bvellanki <[email protected]> Reviewers: "Ying Zheng <[email protected]>, Venkat Ranganathan <[email protected]>, Venkatesan Ramachandran <[email protected]>" Closes #213 from bvellanki/FALCON-2061 (cherry picked from commit 91f7c817c4c82399a5e7e8eef8e4d60450b92e4a) Signed-off-by: bvellanki <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/c9e93162 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c9e93162 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c9e93162 Branch: refs/heads/0.10 Commit: c9e93162a88694753a34da2b89abaa570aa0b2c3 Parents: 2e986a3 Author: bvellanki <[email protected]> Authored: Thu Jul 7 11:33:41 2016 -0700 Committer: bvellanki <[email protected]> Committed: Thu Jul 7 11:33:51 2016 -0700 ---------------------------------------------------------------------- src/bin/falcon-config.sh | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/c9e93162/src/bin/falcon-config.sh ---------------------------------------------------------------------- diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh index ecac65e..20f04af 100644 --- a/src/bin/falcon-config.sh +++ b/src/bin/falcon-config.sh @@ -68,18 +68,6 @@ case $type in for i in `ls ${BASEDIR}/server/webapp`; do FALCONCPPATH="${FALCONCPPATH}:${i}/WEB-INF/lib/*" done - # In future we should refactor the CP directories between server and client - HADOOPDIR=`which hadoop` - if [ "$HADOOP_HOME" != "" ]; then - echo "Hadoop home is set, adding libraries from '${HADOOP_HOME}/bin/hadoop classpath' into falcon classpath" - FALCONCPPATH="${FALCONCPPATH}:`${HADOOP_HOME}/bin/hadoop classpath`" - elif [ "$HADOOPDIR" != "" ]; then - echo "Hadoop is installed, adding hadoop classpath to falcon classpath" - FALCONCPPATH="${FALCONCPPATH}:`hadoop classpath`" - else - echo "Could not find installed hadoop and HADOOP_HOME is not set." - echo "Please make sure either HADOOP_HOME is set or hadoop is in the PATH" - fi FALCON_OPTS="$FALCON_OPTS $FALCON_CLIENT_OPTS $FALCON_CLIENT_HEAP" ;; server)
