accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject accumulo git commit: ACCUMULO-3685 Add slf4j jars to initial classpath
Date Thu, 19 Mar 2015 21:45:47 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 261801559 -> b0c759260


ACCUMULO-3685 Add slf4j jars to initial classpath


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0c75926
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0c75926
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0c75926

Branch: refs/heads/master
Commit: b0c75926050d9ff661fc947105c5dbed60a7e3ad
Parents: 2618015
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Mar 19 17:19:54 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Mar 19 17:19:54 2015 -0400

----------------------------------------------------------------------
 assemble/bin/accumulo | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0c75926/assemble/bin/accumulo
----------------------------------------------------------------------
diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo
index 64b2f99..8382eed 100755
--- a/assemble/bin/accumulo
+++ b/assemble/bin/accumulo
@@ -113,7 +113,8 @@ esac
 
 XML_FILES="${ACCUMULO_CONF_DIR}"
 LOG4J_JAR=$(find -H "${HADOOP_PREFIX}/lib" "${HADOOP_PREFIX}"/share/hadoop/common/lib -name
'log4j*.jar' -print 2>/dev/null | head -1)
-CLASSPATH="${XML_FILES}:${START_JAR}:${LOG4J_JAR}"
+SLF4J_JARS="${ACCUMULO_HOME}/lib/slf4j-api.jar:${ACCUMULO_HOME}/lib/slf4j-log4j12.jar"
+CLASSPATH="${XML_FILES}:${START_JAR}:${SLF4J_JARS}:${LOG4J_JAR}:${CLASSPATH}"
 
 if [ -z "${JAVA_HOME}" -o ! -d "${JAVA_HOME}" ]; then
    echo "JAVA_HOME is not set or is not a directory.  Please make sure it's set globally
or in conf/accumulo-env.sh"


Mime
View raw message