You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/04/04 05:24:50 UTC
git commit: TAJO-735: Remove multiple SLF4J bindings message.
(hyoungjunkim via hyunsik)
Repository: tajo
Updated Branches:
refs/heads/master e036ea36d -> dd7d041ac
TAJO-735: Remove multiple SLF4J bindings message. (hyoungjunkim via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/dd7d041a
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/dd7d041a
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/dd7d041a
Branch: refs/heads/master
Commit: dd7d041acecfc8bb7d9e80d6a808420807d50b21
Parents: e036ea3
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri Apr 4 12:24:03 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri Apr 4 12:24:03 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
tajo-dist/src/main/bin/tajo | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/dd7d041a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1bc6122..bbb5e1c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -143,6 +143,8 @@ Release 0.8.0 - unreleased
IMPROVEMENTS
+ TAJO-735: Remove multiple SLF4J bindings message. (hyoungjunkim via hyunsik)
+
TAJO-709: Add .reviewboardrc and use rbt instead of post-review.
(David Chen via hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/dd7d041a/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index 77d4a02..24dce60 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -281,8 +281,9 @@ TAJO_BASE_CLASSPATH="${TAJO_CONF_DIR}"
TAJO_JAR_DIRS="$TAJO_HOME
${TAJO_HOME}/lib"
+# We need to avoid the inclusion of slf4 twice.
for d in $TAJO_JAR_DIRS; do
- for j in `find $d/*.jar ! -name "*test*"`; do
+ for j in `find $d/*.jar ! -name "*test*" | grep -v slf4`; do
TAJO_BASE_CLASSPATH=$TAJO_BASE_CLASSPATH:$j
done
done
@@ -402,4 +403,4 @@ TAJO_OPTS="$TAJO_OPTS -Dtajo.policy.file=$TAJO_POLICYFILE"
# run it
export CLASSPATH=$CLASSPATH
-exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS $CLASS $TAJO_DAEMON_MODE "$@"
\ No newline at end of file
+exec "$JAVA" -Dproc_$COMMAND $TAJO_OPTS $CLASS $TAJO_DAEMON_MODE "$@"