Repository: samza Updated Branches: refs/heads/master abf49eaaa -> ed621b269
SAMZA-1817: Long classpath support for non-split deployments https://jira.apache.org/jira/browse/SAMZA-1817 Author: Sanil Jain <[email protected]> Reviewers: Shanthoosh Venkataraman <[email protected]>, Boris Shkolnik <[email protected]> Closes #619 from Sanil15/SAMZA-1817 Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/ed621b26 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/ed621b26 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/ed621b26 Branch: refs/heads/master Commit: ed621b269624bd285333035417dda3158b98c1f0 Parents: abf49ea Author: Sanil Jain <[email protected]> Authored: Fri Sep 7 15:44:15 2018 -0700 Committer: Boris S <[email protected]> Committed: Fri Sep 7 15:44:15 2018 -0700 ---------------------------------------------------------------------- samza-shell/src/main/bash/run-class.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/ed621b26/samza-shell/src/main/bash/run-class.sh ---------------------------------------------------------------------- diff --git a/samza-shell/src/main/bash/run-class.sh b/samza-shell/src/main/bash/run-class.sh index ac5f0ff..ee9eb31 100755 --- a/samza-shell/src/main/bash/run-class.sh +++ b/samza-shell/src/main/bash/run-class.sh @@ -44,10 +44,12 @@ DEFAULT_LOG4J_FILE=$base_dir/lib/log4j.xml BASE_LIB_DIR="$base_dir/lib" # JOB_LIB_DIR will be set for yarn container in ContainerUtil.java # for others we set it to home_dir/lib -JOB_LIB_DIR="${JOB_LIB_DIR:-$home_dir/lib}" +JOB_LIB_DIR="${JOB_LIB_DIR:-$base_dir/lib}" export JOB_LIB_DIR=$JOB_LIB_DIR +echo JOB_LIB_DIR=$JOB_LIB_DIR +echo BASE_LIB_DIR=$BASE_LIB_DIR if [ -d "$JOB_LIB_DIR" ] && [ "$JOB_LIB_DIR" != "$BASE_LIB_DIR" ]; then # build a common classpath # this class path will contain all the jars from the framework and the job's libs. @@ -68,11 +70,15 @@ if [ -d "$JOB_LIB_DIR" ] && [ "$JOB_LIB_DIR" != "$BASE_LIB_DIR" ]; then echo all_jars=$all_jars echo generated combined CLASSPATH=$CLASSPATH else - #default behavior - for file in $BASE_LIB_DIR/*.[jw]ar; + # default behaviour + # Wildcarding only includes *.jar and *.JAR files in classpath + CLASSPATH=$CLASSPATH:"$BASE_LIB_DIR/*"; + # We handle .war separately + for file in $BASE_LIB_DIR/*.war; do CLASSPATH=$CLASSPATH:$file done + echo generated from BASE_LIB_DIR CLASSPATH=$CLASSPATH fi if [ -z "$JAVA_HOME" ]; then
