Fix: Use 2.7 java JAR and class names

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 053106079740f37eaf3ab8639e6af3fe8e8122af..e5a9a9ea231603d61715bdd2432f027be5d9c694 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -386,24 +386,24 @@ if test "x$test_java_agent_jul" = "xyes" || test "x$test_java_agent_log4j" = "xy
        AX_CHECK_CLASSPATH
 
        # Check for Java UST agent common class first
-       AX_CHECK_CLASS(org.lttng.ust.agent.AbstractLttngAgent)
-       if test "x$ac_cv_class_org_lttng_ust_agent_AbstractLttngAgent" = "xno"; then
-               AC_MSG_ERROR([The UST Java agent common class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/lttng-ust-agent-common.jar"])
+       AX_CHECK_CLASS(org.lttng.ust.agent.LTTngAgent)
+       if test "x$ac_cv_class_org_lttng_ust_agent_LTTngAgent" = "xno"; then
+               AC_MSG_ERROR([The UST Java agent common class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/liblttng-ust-agent.jar"])
        fi
 
        if test "x$test_java_agent_jul" = "xyes"; then
                # Check for JUL agent class
-               AX_CHECK_CLASS(org.lttng.ust.agent.jul.LttngLogHandler)
-               if test "x$ac_cv_class_org_lttng_ust_agent_jul_LttngLogHandler" = "xno"; then
-                       AC_MSG_ERROR([The UST Java agent JUL class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/lttng-ust-agent-jul.jar"])
+               AX_CHECK_CLASS(org.lttng.ust.agent.jul.LTTngJUL)
+               if test "x$ac_cv_class_org_lttng_ust_agent_jul_LTTngJUL" = "xno"; then
+                       AC_MSG_ERROR([The UST Java agent JUL class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/liblttng-ust-jul.jar"])
                fi
        fi
 
        if test "x$test_java_agent_log4j" = "xyes"; then
                # Check for Log4j agent class
-               AX_CHECK_CLASS(org.lttng.ust.agent.log4j.LttngLogAppender)
-               if test "x$ac_cv_class_org_lttng_ust_agent_log4j_LttngLogAppender" = "xno"; then
-                       AC_MSG_ERROR([The UST Java agent Log4j class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/lttng-ust-agent-log4j.jar"])
+               AX_CHECK_CLASS(org.lttng.ust.agent.log4j.LTTngLog4j)
+               if test "x$ac_cv_class_org_lttng_ust_agent_log4j_LTTngLog4j" = "xno"; then
+                       AC_MSG_ERROR([The UST Java agent Log4j class was not found. Please specify the location of the jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/liblttng-ust-agent.jar"])
                fi
 
                # Check for Log4j class

diff --git a/tests/regression/ust/java-jul/JTestLTTng.java b/tests/regression/ust/java-jul/JTestLTTng.java
index 741d820321425148719d59a5d48437c8a18fd13b..9431551cdb4a580c2e06ff92b96f694f90cdcd01 100644 (file)
--- a/tests/regression/ust/java-jul/JTestLTTng.java
+++ b/tests/regression/ust/java-jul/JTestLTTng.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
  * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -16,29 +15,20 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-import java.io.IOException;
 import java.lang.Integer;
-import java.util.logging.Handler;
 import java.util.logging.Logger;
 import java.util.logging.Level;
 
-import org.lttng.ust.agent.jul.LttngLogHandler;
+import org.lttng.ust.agent.LTTngAgent;
 
-public class JTestLTTng {
-
-       /**
-        * Application start
-        *
-        * @param args
-        *            Command-line arguments
-        * @throws IOException
-        * @throws InterruptedException
-        */
-       public static void main(String args[]) throws IOException, InterruptedException {
+public class JTestLTTng
+{
+       private static LTTngAgent lttngAgent;
 
+       public static void main(String args[]) throws Exception
+       {
                Logger lttng = Logger.getLogger("JTestLTTng");
                Logger lttng2 = Logger.getLogger("JTestLTTng2");
-
                int nrIter = Integer.parseInt(args[0]);
                int waitTime = Integer.parseInt(args[1]);
                int fire_finest_tp = 0;
@@ -51,11 +41,7 @@ public class JTestLTTng {
                        fire_second_tp = Integer.parseInt(args[3]);
                }
 
-               /* Instantiate a LTTngLogHandler object, and attach it to our loggers */
-               Handler lttngHandler = new LttngLogHandler();
-               lttng.addHandler(lttngHandler);
-               lttng2.addHandler(lttngHandler);
-
+               lttngAgent = LTTngAgent.getLTTngAgent();
                lttng.setLevel(Level.FINEST);
 
                for (int iter = 0; iter < nrIter; iter++) {
@@ -71,10 +57,6 @@ public class JTestLTTng {
                        lttng2.info("JUL second logger fired");
                }
 
-               /*
-                * Do not forget to close() all handlers so that the agent can shutdown
-                * and the session daemon socket gets cleaned up explicitly.
-                */
-               lttngHandler.close();
+               lttngAgent.dispose();
        }
 }

diff --git a/tests/regression/ust/java-log4j/JTestLTTng.java b/tests/regression/ust/java-log4j/JTestLTTng.java
index 64a471bf85607ffe6238f5ced8b6d436cc73a875..0019cb825b7d4fff1a4163d5a1fb3e102540df2d 100644 (file)
--- a/tests/regression/ust/java-log4j/JTestLTTng.java
+++ b/tests/regression/ust/java-log4j/JTestLTTng.java
@@ -1,5 +1,4 @@
 /*
- * Copyright (C) 2015 - Michael Jeanson <dgoulet@efficios.com>
  * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
  *                      Christian Babeux <christian.babeux@efficios.com>
  *
@@ -20,26 +19,19 @@
 import java.io.IOException;
 import java.lang.Integer;
 
-import org.apache.log4j.Appender;
-import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
-import org.lttng.ust.agent.log4j.LttngLogAppender;
+import org.apache.log4j.BasicConfigurator;
 
-public class JTestLTTng {
+import org.lttng.ust.agent.LTTngAgent;
 
-       /**
-        * Application start
-        *
-        * @param args
-        *            Command-line arguments
-        * @throws IOException
-        * @throws InterruptedException
-        */
-       public static void main(String args[]) throws IOException, InterruptedException {
+public class JTestLTTng
+{
+       private static LTTngAgent lttngAgent;
 
+       public static void main(String args[]) throws Exception
+       {
                Logger lttng = Logger.getLogger("log4j-event");
                Logger lttng2 = Logger.getLogger("log4j-event-2");
-
                int nrIter = Integer.parseInt(args[0]);
                int waitTime = Integer.parseInt(args[1]);
                int fire_debug_tp = 0;
@@ -52,16 +44,8 @@ public class JTestLTTng {
                        fire_second_tp = Integer.parseInt(args[3]);
                }
 
-               /* Start with the default Log4j configuration, which logs to console */
                BasicConfigurator.configure();
-
-               /*
-                * Add a LTTng log appender to both loggers, which will also send the
-                * logged events to UST.
-                */
-               Appender lttngAppender = new LttngLogAppender();
-               lttng.addAppender(lttngAppender);
-               lttng2.addAppender(lttngAppender);
+               lttngAgent = LTTngAgent.getLTTngAgent();
 
                for (int iter = 0; iter < nrIter; iter++) {
                        lttng.info("LOG4J tp fired!");
@@ -75,11 +59,5 @@ public class JTestLTTng {
                if (fire_second_tp == 1) {
                        lttng2.info("LOG4J second logger fired");
                }
-
-               /*
-                * Do not forget to close() all handlers so that the agent can shutdown
-                * and the session daemon socket gets cleaned up explicitly.
-                */
-               lttngAppender.close();
        }
 }