X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=c153e7b848569dc713b53051ad93d7ecbfc59587;hb=464c475658ae29039b3b9e769b5b02195688a94a;hp=3a84f594b1484b3402bd8929bf64b59ab75bb0fa;hpb=501f6777610d7f8d855453c0083a10912d5fac4b;p=lttng-ust.git

diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
index 3a84f594..c153e7b8 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
@@ -6,20 +8,31 @@
 # find the JNI Log4j library.
 #
 
-DIR=`dirname $0`
-JARFILE="liblttng-ust-agent.jar"
-LOG4J="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+DIR=$(dirname "$0")
+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
+if [ "x$CLASSPATH" = "x" ]; then
+	CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+fi
 
-cd $DIR
+cd "$DIR" || exit 1
 
 if [ -f "$DIR/.intree" ]; then
-	CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$LOG4J"
-	LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
+	CLASSPATH="$CLASSPATH:../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON"
+	CLASSPATH="$CLASSPATH:../../../src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/$JARFILE_LOG4J"
+	LIBPATH="../../../src/lib/lttng-ust-java-agent/jni/log4j/.libs"
 else
-	CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$LOG4J"
-	LIBPATH="/usr/local/lib:/usr/lib"
+	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
 
-java -cp "$CLASSPATH:." Hello
+if [ "x$LIBPATH" != "x" ]; then
+	JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH"
+fi
 
-cd -
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS HelloLog4j