From 2ac851987b0cd66f9b566da2a1854fa309c3bbd0 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 3 Nov 2011 13:03:21 -0400
Subject: [PATCH] Rename UST.class to LTTNG_UST.class

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 liblttng-ust-java/{UST.c => LTTNG_UST.c}         | 10 ++++++----
 liblttng-ust-java/LTTNG_UST.java                 |  9 +++++++++
 liblttng-ust-java/Makefile.am                    | 16 ++++++++--------
 liblttng-ust-java/UST.java                       |  9 ---------
 .../{ust_java.h => lttng_ust_java.h}             |  8 ++++----
 5 files changed, 27 insertions(+), 25 deletions(-)
 rename liblttng-ust-java/{UST.c => LTTNG_UST.c} (51%)
 create mode 100644 liblttng-ust-java/LTTNG_UST.java
 delete mode 100644 liblttng-ust-java/UST.java
 rename liblttng-ust-java/{ust_java.h => lttng_ust_java.h} (89%)

diff --git a/liblttng-ust-java/UST.c b/liblttng-ust-java/LTTNG_UST.c
similarity index 51%
rename from liblttng-ust-java/UST.c
rename to liblttng-ust-java/LTTNG_UST.c
index 7ad1c717..e61c63bd 100644
--- a/liblttng-ust-java/UST.c
+++ b/liblttng-ust-java/LTTNG_UST.c
@@ -1,15 +1,17 @@
 #include <jni.h>
 
 #define TRACEPOINT_CREATE_PROBES
-#include "ust_java.h"
+#include "lttng_ust_java.h"
 
-JNIEXPORT void JNICALL Java_UST_ust_1java_1event (JNIEnv *env, jobject jobj,
-						jstring ev_name, jstring args)
+JNIEXPORT void JNICALL Java_LTTNG_UST_ust_1java_1event (JNIEnv *env,
+						jobject jobj,
+						jstring ev_name,
+						jstring args)
 {
 	jboolean iscopy;
 	const char *ev_name_cstr = (*env)->GetStringUTFChars(env, ev_name,
 							&iscopy);
 	const char *args_cstr = (*env)->GetStringUTFChars(env, args, &iscopy);
 
-	tracepoint(ust_java_event, ev_name_cstr, args_cstr);
+	tracepoint(lttng_ust_java_string, ev_name_cstr, args_cstr);
 }
diff --git a/liblttng-ust-java/LTTNG_UST.java b/liblttng-ust-java/LTTNG_UST.java
new file mode 100644
index 00000000..f6fcd4af
--- /dev/null
+++ b/liblttng-ust-java/LTTNG_UST.java
@@ -0,0 +1,9 @@
+import java.util.*;
+
+class LTTNG_UST {
+	public static native void lttng_ust_java_string(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 fb25cb7b..d80343a6 100644
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -3,19 +3,19 @@ if BUILD_JNI_INTERFACE
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = liblttng-ust-java.la
-liblttng_ust_java_la_SOURCES = UST.c UST.h ust_java.h
-dist_noinst_DATA = UST.java
+liblttng_ust_java_la_SOURCES = LTTNG_UST.c LTTNG_UST.h lttng_ust_java.h
+dist_noinst_DATA = LTTNG_UST.java
 liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 
-all: UST.class UST.h
+all: LTTNG_UST.class LTTNG_UST.h
 
 clean-local:
-	rm -rf UST.h UST.class
+	rm -rf LTTNG_UST.h LTTNG_UST.class
 
-UST.class: UST.java
-	javac -d "$(builddir)" "$(srcdir)/UST.java"
+LTTNG_UST.class: LTTNG_UST.java
+	javac -d "$(builddir)" "$(srcdir)/LTTNG_UST.java"
 
-UST.h: UST.class
-	javah -jni UST
+LTTNG_UST.h: LTTNG_UST.class
+	javah -jni LTTNG_UST
 
 endif
diff --git a/liblttng-ust-java/UST.java b/liblttng-ust-java/UST.java
deleted file mode 100644
index be5f7c73..00000000
--- a/liblttng-ust-java/UST.java
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.util.*;
-
-class UST {
-	public static native void ust_java_event(String name, String arg);
-	static {
-		System.loadLibrary("ustjava");
-	}
-}
-
diff --git a/liblttng-ust-java/ust_java.h b/liblttng-ust-java/lttng_ust_java.h
similarity index 89%
rename from liblttng-ust-java/ust_java.h
rename to liblttng-ust-java/lttng_ust_java.h
index 366b3737..ccb62331 100644
--- a/liblttng-ust-java/ust_java.h
+++ b/liblttng-ust-java/lttng_ust_java.h
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_java_event,
+TRACEPOINT_EVENT(lttng_ust_java_string,
 	TP_PROTO(const char *name, const char *args),
 	TP_ARGS(name, args),
 	TP_FIELDS(
@@ -38,7 +38,7 @@ TRACEPOINT_EVENT(ust_java_event,
 #undef TRACEPOINT_INCLUDE_PATH
 #define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_java
+#define TRACEPOINT_INCLUDE_FILE lttng_ust_java
 
 /* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
-- 
2.34.1