X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=doc%2Fexamples%2Fjava-jul%2Frun;h=eb340da88fac2efc6d77851f398773a38c2561fe;hb=c2da416ae9292de321f63ace1590304133563dd0;hp=1beac853f3e9cd59cdbc40887df81e11dbfc070d;hpb=631dc14c99a187453b9c46aca090fcf3b7ed8ec9;p=lttng-ust.git

diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run
index 1beac853..eb340da8 100755
--- a/doc/examples/java-jul/run
+++ b/doc/examples/java-jul/run
@@ -7,18 +7,27 @@
 #
 
 DIR=`dirname $0`
-JARFILE="liblttng-ust-agent.jar"
+JARFILE_COMMON="lttng-ust-agent-common.jar"
+JARFILE_JUL="lttng-ust-agent-jul.jar"
+JAVA_OPTIONS=""
 
 cd $DIR
 
 if [ -f "$DIR/.intree" ]; then
-	CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE"
+	CLASSPATH="../../../liblttng-ust-java-agent/java/lttng-ust-agent-common/$JARFILE_COMMON"
+	CLASSPATH="$CLASSPATH:../../../liblttng-ust-java-agent/java/lttng-ust-agent-jul/$JARFILE_JUL"
 	LIBPATH="../../../liblttng-ust-java-agent/jni/jul/.libs"
 else
-	CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE"
-	LIBPATH="/usr/local/lib:/usr/lib"
+	CLASSPATH="/usr/local/share/java/$JARFILE_COMMON:/usr/share/java/$JARFILE_COMMON"
+	CLASSPATH="$CLASSPATH:/usr/local/share/java/$JARFILE_JUL:/usr/share/java/$JARFILE_JUL"
+	# 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 -