From 5d91531ee09c29584092c963eb3e05d65b55d77a Mon Sep 17 00:00:00 2001
From: ags <andrzej.grzesik@gmail.com>
Date: Wed, 7 Mar 2018 15:22:49 +0000
Subject: [PATCH] Webserver should not require Jolokia in any way

---
 webserver/build.gradle                        |  3 --
 .../corda/webserver/JolokiaSlf4jAdapter.kt    | 38 -------------------
 2 files changed, 41 deletions(-)
 delete mode 100644 webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4jAdapter.kt

diff --git a/webserver/build.gradle b/webserver/build.gradle
index b806d091dc..523f67ec5a 100644
--- a/webserver/build.gradle
+++ b/webserver/build.gradle
@@ -66,9 +66,6 @@ dependencies {
     // For rendering the index page.
     compile "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.3"
 
-    // for Jolokia logger
-    compile "org.jolokia:jolokia-war:$jolokia_version"
-
     integrationTestCompile project(':node-driver')
     testCompile "junit:junit:$junit_version"
 }
diff --git a/webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4jAdapter.kt b/webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4jAdapter.kt
deleted file mode 100644
index 42091cac8c..0000000000
--- a/webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4jAdapter.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package net.corda.webserver
-
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import org.jolokia.util.LogHandler
-
-/**
- * This also exists in node, because depends on jolokia
- **/
-class JolokiaSlf4jAdapter : LogHandler {
-    companion object {
-        val log: Logger = LoggerFactory.getLogger("org.jolokia")
-    }
-
-    override fun error(message: String?, t: Throwable?) {
-        if (message != null) {
-            if (t != null) {
-                log.error(message, t)
-            } else {
-                log.error(message)
-            }
-        } else if (t != null) {
-            log.error("Exception without a comment", t)
-        }
-    }
-
-    override fun debug(message: String?) {
-        if (message != null) {
-            log.debug(message)
-        }
-    }
-
-    override fun info(message: String?) {
-        if (message != null) {
-            log.info(message)
-        }
-    }
-}