X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Fjava-log4j%2Frun;h=056ea67f3300a3178bfbd95cc15c9de4de40d9d6;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=5e3cbeb4b20e84bb16a9cd2ab9830dde9dfb7318;hpb=be347eb9b64f54c37940f272ba70c74a2f8330a5;p=lttng-ust.git

diff --git a/doc/examples/java-log4j/run b/doc/examples/java-log4j/run
index 5e3cbeb4..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,20 +9,32 @@
 #
 
 DIR=`dirname $0`
-JARFILE="liblttng-ust-agent.jar"
-LOG4J="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.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
+if [ "x$CLASSPATH" = "x" ]; then
+	CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+fi
 
 cd $DIR
 
 if [ -f "$DIR/.intree" ]; then
-	CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$LOG4J"
+	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:$LOG4J"
+	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 -classpath "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
+if [ "x$LIBPATH" != "x" ]; then
+	JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=$LIBPATH"
+fi
+
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
 
 cd -