Move to kernel style SPDX license identifiers

[lttng-ust.git] / doc / examples / java-jul / run

diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run
index 37a3cfdf043b0a5df58a0df280434433a9a10c7a..03a5fd6fe78d909164cd392d29fe9a697f0ea51c 100755 (executable)
--- a/doc/examples/java-jul/run
+++ b/doc/examples/java-jul/run
@@ -1,5 +1,6 @@
 #!/bin/bash
-
+#
+# SPDX-License-Identifier: MIT
 #
 # The -cp path should be changed to the lttng ust JUL jar file on your system
 # or locally to the project. Same goes for the Java library path in order to
@@ -7,19 +8,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"
+       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 -