X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=056ea67f3300a3178bfbd95cc15c9de4de40d9d6;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=91f8f5d6b74300996b999f216e31fb2f2c935077;hpb=cd9116e546266e810595c95b7916f115c82ac161;p=lttng-ust.git diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run index 91f8f5d6..056ea67f 100755 --- a/doc/examples/java-log4j/run +++ b/doc/examples/java-log4j/run @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: MIT # # The -cp path should be changed to the lttng ust agent jar file on your system @@ -7,7 +9,8 @@ # DIR=`dirname $0` -JARFILE="liblttng-ust-agent.jar" +JARFILE_COMMON="lttng-ust-agent-common.jar" +JARFILE_LOG4J="lttng-ust-agent-log4j.jar" JAVA_OPTIONS="" # If system classpath is empty, try to guess log4j location @@ -18,16 +21,18 @@ fi cd $DIR if [ -f "$DIR/.intree" ]; then - CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$CLASSPATH" + CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON" + CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J" LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs" else - CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH" + CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON" + CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_LOG4J:/usr/share/java/$JARFILE_LOG4J" # Use system defined java.library.path #LIBPATH="/usr/local/lib:/usr/lib" fi if [ "x$LIBPATH" != "x" ]; then - JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=\"$LIBPATH\"" + JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH" fi java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello