From 6490eba0f6e5e7f5a50d4707f4b60fca0cc61e1e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 15 Nov 2013 11:59:46 -0500 Subject: [PATCH] JUL: install documentation and jar file Signed-off-by: Mathieu Desnoyers --- configure.ac | 3 +++ doc/Makefile.am | 2 ++ .../README => doc/java-util-logging.txt | 19 +++++++++++-------- liblttng-ust-jul/Makefile.am | 2 ++ 4 files changed, 18 insertions(+), 8 deletions(-) rename liblttng-ust-jul/README => doc/java-util-logging.txt (72%) diff --git a/configure.ac b/configure.ac index 37ea8c65..1eda569c 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,9 @@ AC_ARG_WITH([lttng-system-rundir], AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], [LTTng system runtime directory]) +lttnglibjavadir="${libdir}/lttng/java" +AC_SUBST(lttnglibjavadir) + AC_CONFIG_FILES([ Makefile doc/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index ccd6d189..4349713b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -3,3 +3,5 @@ SUBDIRS = . examples dist_man_MANS = man/lttng-gen-tp.1 \ man/lttng-ust.3 \ man/lttng-ust-cyg-profile.3 + +dist_doc_DATA = java-util-logging.txt diff --git a/liblttng-ust-jul/README b/doc/java-util-logging.txt similarity index 72% rename from liblttng-ust-jul/README rename to doc/java-util-logging.txt index 6e2ee98b..9f827e6a 100644 --- a/liblttng-ust-jul/README +++ b/doc/java-util-logging.txt @@ -1,6 +1,5 @@ -This directory contains the LTTng Java Agent for JUL support. - -Configuration examples to build this library: +The support for JUL needs to be explicitly enabled when lttng-ust is +configured, e.g.: dependency: openjdk-7-jdk ./configure --with-java-jdk=/usr/lib/jvm/java-7-openjdk --with-jni-interface @@ -14,6 +13,10 @@ we directly support that version for this library. However, it has been tested with OpenJDK 6 also. Please let us know if other Java version (commercial or not) work with this library. +The LTTng Java Agent for JUL support is typically installed here: + +/usr/local/lib/lttng/java/liblttng-ust-jul.jar + After building, you can use the "liblttng-ust-jul.jar" file in a Java project. It requires "liblttng-ust-jul.so" which is installed by the build system when doing "make install". Make sure that your Java application can find this shared @@ -28,11 +31,11 @@ import org.lttng.ust.jul.LTTngAgent; [...] lttngAgent = LTTngAgent.getLTTngAgent(); -This will initialize automatically the singleton LTTngAgent, it will stall -your application until the session daemon registration is done. If no session -daemon is available, the execution will continue and the agent will retry at -each 3 seconds. +This will initialize automatically the singleton LTTngAgent, and will +return when session daemon registration is done. If no session daemon is +available, the execution will continue and the agent will retry every +3 seconds. Once registered, it is adds a thread inside your Java application and will be able to automatically use every Logger object and map them to the jul_event -tracepoint of the JNI interface (see LTTngUst.c/.java). +tracepoint of the JNI interface. diff --git a/liblttng-ust-jul/Makefile.am b/liblttng-ust-jul/Makefile.am index ac3d5217..e4f0480b 100644 --- a/liblttng-ust-jul/Makefile.am +++ b/liblttng-ust-jul/Makefile.am @@ -8,6 +8,8 @@ nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_jul_LTTngUst.h dist_noinst_DATA = $(LTTNG_JUL_SRCDIR)/LTTngUst.java liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust +lttnglibjava_DATA = liblttng-ust-jul.jar + LTTNG_JUL_SRCDIR = $(srcdir)/org/lttng/ust/jul LTTNG_JUL_DESTDIR = $(builddir)/org/lttng/ust/jul -- 2.34.1