Fix: re-add liblttng-ust-agent.jar

Re-add a jar file that imports all other LTTng java agents (JUL and
log4j) if they are available on the system.

This provides backwards compatibility with Java applications that have
CLASSPATH defined following UST 2.7 documentation.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index 6850489a5185f709d8b087ee4c526f93f21338df..64ac088996fa948843e7a73a3510c955dfa3ed37 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,7 @@ AC_CONFIG_FILES([
        liblttng-ust-java/Makefile
        liblttng-ust-java-agent/Makefile
        liblttng-ust-java-agent/java/Makefile
+       liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile
        liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
        liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
        liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index a10a393f12b7774c168d9dfbd9c1b25f8b2b29d7..bc40dc99e95edbf521d5c8299b1ed25218f4304d 100644 (file)
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lttng-ust-agent-common
+SUBDIRS = lttng-ust-agent-common liblttng-ust-agent
 
 if BUILD_JAVA_AGENT_WITH_JUL
 SUBDIRS += lttng-ust-agent-jul

diff --git a/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am b/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am
new file mode 100644 (file)
index 0000000..23f5502
--- /dev/null
+++ b/liblttng-ust-java-agent/java/liblttng-ust-agent/Makefile.am
@@ -0,0 +1,13 @@
+JAVAROOT = .
+
+jarfile_manifest = $(srcdir)/Manifest.txt
+jarfile = liblttng-ust-agent.jar
+
+jardir = $(datadir)/java
+
+dist_noinst_DATA = $(jarfile_manifest)
+
+jar_DATA = $(jarfile)
+
+$(jarfile):
+       $(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest)

diff --git a/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt b/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt
new file mode 100644 (file)
index 0000000..9612845
--- /dev/null
+++ b/liblttng-ust-java-agent/java/liblttng-ust-agent/Manifest.txt
@@ -0,0 +1,8 @@
+Name: org/lttng/ust/agent/all/
+Specification-Title: LTTng UST All Java Agents
+Specification-Version: 1.0.0
+Specification-Vendor: LTTng Project
+Implementation-Title: org.lttng.ust.agent
+Implementation-Version: 1.0.0
+Implementation-Vendor: LTTng Project
+Class-Path: lttng-ust-agent-jul.jar lttng-ust-agent-log4j.jar