Restoring Jolokia in webserver, to be able to redirect logger via Slf4j

node/src/main/kotlin/net/corda/node/JolokiaSlf4jAdapter.kt

@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory
 /**
  * This also exists in webserver, because depends on jolokia
  **/
-class JolokiaSlf4Adapter : LogHandler {
+class JolokiaSlf4jAdapter : LogHandler {
     companion object {
         val log: Logger = LoggerFactory.getLogger("org.jolokia")
     }
@@ -35,6 +35,4 @@ class JolokiaSlf4Adapter : LogHandler {
             log.info(message)
         }
     }
-
-
 }

webserver/build.gradle

@@ -5,6 +5,13 @@ apply plugin: 'com.jfrog.artifactory'
 
 description 'Corda node web server'
 
+buildscript {
+    def properties = new Properties()
+    file("$projectDir/src/main/resources/build.properties").withInputStream { properties.load(it) }
+
+    ext.jolokia_version = properties.getProperty('jolokiaAgentVersion')
+}
+
 configurations {
     integrationTestCompile.extendsFrom testCompile
     integrationTestRuntime.extendsFrom testRuntime
@@ -59,6 +66,9 @@ 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"
 }

webserver/src/main/kotlin/net/corda/webserver/JolokiaSlf4jAdapter.kt

@@ -1,13 +1,13 @@
 package net.corda.webserver
 
-import org.jolokia.util.LogHandler
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.jolokia.util.LogHandler
 
 /**
  * This also exists in node, because depends on jolokia
  **/
-class JolokiaSlf4Adapter : LogHandler {
+class JolokiaSlf4jAdapter : LogHandler {
     companion object {
         val log: Logger = LoggerFactory.getLogger("org.jolokia")
     }
@@ -35,6 +35,4 @@ class JolokiaSlf4Adapter : LogHandler {
             log.info(message)
         }
     }
-
-
 }

webserver/src/main/resources/build.properties

@@ -0,0 +1,5 @@
+# Build constants exported as resource file to make them visible in Node program
+# Note: sadly, due to present limitation of IntelliJ-IDEA in processing resource files, these constants cannot be
+# imported from top-level 'constants.properties' file
+
+jolokiaAgentVersion=1.3.7