From e7927b21ed2f3942f4bfeecdd185d44030238f9a Mon Sep 17 00:00:00 2001
From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Fri, 17 Jul 2015 13:00:41 -0400
Subject: [PATCH] Remove deprecated org.lttng.ust.jul.LTTngAgent class

This interface was deprecated back in 2.6. All users should now
use the org.lttng.ust.agent.jul.LTTngAgent class instead.

Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 liblttng-ust-java-agent/java/Makefile.am      | 14 ++----
 .../java/org/lttng/ust/jul/LTTngAgent.java    | 50 -------------------
 2 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 100644 liblttng-ust-java-agent/java/org/lttng/ust/jul/LTTngAgent.java

diff --git a/liblttng-ust-java-agent/java/Makefile.am b/liblttng-ust-java-agent/java/Makefile.am
index 399b533e..1232d6e5 100644
--- a/liblttng-ust-java-agent/java/Makefile.am
+++ b/liblttng-ust-java-agent/java/Makefile.am
@@ -1,15 +1,12 @@
 JAVAROOT = .
 
 pkgpath = org/lttng/ust/agent
-pkgpath_old = org/lttng/ust/jul
 
 jarfile_version = 1.0.0
 jarfile_manifest = $(srcdir)/$(pkgpath)/Manifest.txt
 jarfile_symlink = liblttng-ust-agent.jar
 jarfile = liblttng-ust-agent-$(jarfile_version).jar
 
-jarfile_old = liblttng-ust-jul.jar
-
 jardir = $(datadir)/java
 
 juljniout = ../jni/jul
@@ -21,12 +18,11 @@ dist_noinst_JAVA = $(pkgpath)/LTTngAgent.java \
 		   $(pkgpath)/LogFramework.java \
 		   $(pkgpath)/LogFrameworkSkeleton.java \
 		   $(pkgpath)/jul/LTTngJUL.java \
-		   $(pkgpath)/jul/LTTngLogHandler.java \
-		   $(pkgpath_old)/LTTngAgent.java
+		   $(pkgpath)/jul/LTTngLogHandler.java
 
 dist_noinst_DATA = $(jarfile_manifest)
 
-jar_DATA = $(jarfile) $(jarfile_old)
+jar_DATA = $(jarfile)
 
 stamp =
 classes = $(pkgpath)/*.class
@@ -48,10 +44,6 @@ endif
 $(jarfile): classnoinst.stamp
 	$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)
 
-$(jarfile_old): classnoinst.stamp
-	$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class \
-	$(pkgpath)/jul/*.class $(pkgpath_old)/*.class
-
 jul-jni-header.stamp: $(dist_noinst_JAVA)
 	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LTTngLogHandler && \
 	echo "JUL JNI header generated" > jul-jni-header.stamp
@@ -68,7 +60,7 @@ install-data-hook:
 uninstall-hook:
 	cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink)
 
-CLEANFILES = $(jarfile) $(jarfile_old) $(pkgpath)/*.class $(pkgpath_old)/*.class $(pkgpath)/jul/*.class \
+CLEANFILES = $(jarfile) $(pkgpath)/*.class $(pkgpath)/jul/*.class \
 	$(pkgpath)/log4j/*.class jul-jni-header.stamp log4j-jni-header.stamp \
 	$(juljniout)/org_lttng_ust_agent_jul_LTTngLogHandler.h \
 	$(log4jjniout)/org_lttng_ust_agent_log4j_LTTngLogAppender.h
diff --git a/liblttng-ust-java-agent/java/org/lttng/ust/jul/LTTngAgent.java b/liblttng-ust-java-agent/java/org/lttng/ust/jul/LTTngAgent.java
deleted file mode 100644
index c687c227..00000000
--- a/liblttng-ust-java-agent/java/org/lttng/ust/jul/LTTngAgent.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2014 - Christian Babeux <christian.babeux@efficios.com>
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.lttng.ust.jul;
-
-import java.io.IOException;
-
-@Deprecated
-public class LTTngAgent {
-
-	/*
-	 * !!! WARNING !!!
-	 * Please use the LTTngAgent found in the org.lttng.ust.agent package.
-	 * This class is DEPRECATED.
-	 */
-
-	private static LTTngAgent curAgent = null;
-	private static org.lttng.ust.agent.LTTngAgent realAgent = null;
-
-
-	private LTTngAgent() throws IOException {
-		realAgent = org.lttng.ust.agent.LTTngAgent.getLTTngAgent();
-	}
-
-	public static synchronized LTTngAgent getLTTngAgent() throws IOException {
-		if (curAgent == null) {
-			curAgent = new LTTngAgent();
-		}
-
-		return curAgent;
-	}
-
-	public void dispose() throws IOException {
-		realAgent.dispose();
-	}
-}
-- 
2.34.1