Revert "Build a jar for the Java side of the JNI interface"

This reverts commit 6dcf3689333a2b465a5738c840d0b14d3f8014ea.

This should not go into stable-2.0.

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

diff --git a/liblttng-ust-java/.gitignore b/liblttng-ust-java/.gitignore
index e07ee50388c1928085fd2bd326d20baea86e09be..677373ea416b627ca5039cfcb00cbe99b6827e6d 100644 (file)
--- a/liblttng-ust-java/.gitignore
+++ b/liblttng-ust-java/.gitignore
@@ -1,3 +1,2 @@
 org_lttng_ust_LTTngUst.h
 org/
-liblttng-ust-java.jar

diff --git a/liblttng-ust-java/LTTngUst.java b/liblttng-ust-java/LTTngUst.java
index 68ed120c1bddf3141989f154dfda2c7d786d093c..d3f1edaf6bcebce493dd433c1f4dc8e664df9bcb 100644 (file)
--- a/liblttng-ust-java/LTTngUst.java
+++ b/liblttng-ust-java/LTTngUst.java
@@ -18,7 +18,7 @@
 
 package org.lttng.ust;
 
-public class LTTngUst {
+class LTTngUst {
        public static native void tracepointString(String name, String arg);
        static {
                System.loadLibrary("lttng-ust-java");

diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
index 7e1834a6cc6d1c6cd9b5ba74b8575ff34b324430..9e01e045e34b78ef5c64cd423dccf6a8b83ec32b 100644 (file)
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -7,11 +7,10 @@ liblttng_ust_java_la_SOURCES = LTTngUst.c org_lttng_ust_LTTngUst.h lttng_ust_jav
 dist_noinst_DATA = LTTngUst.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
+all: LTTngUst.class org_lttng_ust_LTTngUst.h
 
 clean-local:
-       rm org_lttng_ust_LTTngUst.h
-       rm liblttng-ust-java.jar
+       rm  org_lttng_ust_LTTngUst.h
        rm -rf org/
 
 LTTngUst.class: LTTngUst.java
@@ -20,7 +19,4 @@ LTTngUst.class: LTTngUst.java
 org_lttng_ust_LTTngUst.h: LTTngUst.class
        javah org.lttng.ust.LTTngUst
 
-liblttng-ust-java.jar: LTTngUst.class
-       jar cf liblttng-ust-java.jar org/*
-
 endif

diff --git a/liblttng-ust-java/README b/liblttng-ust-java/README
index 4b4d2c6ec45a99c217243661b1cdb47312540228..37834e691d3e2c1b5cf76b39201814e2976ecf8c 100644 (file)
--- a/liblttng-ust-java/README
+++ b/liblttng-ust-java/README
@@ -10,8 +10,3 @@ dependency: openjdk-6-jdk
 
 dependency: gcj-4.4-jdk
 ./configure --with-java-jdk=/usr/lib/jvm/java-gcj --with-jni-interface
-
-
-After building, you can use the liblttng-ust-java.jar file in a Java project.
-It requires the liblttng-ust-java.so* files (which get installed when doing
-`make install') so make sure those are in the linker's library path.