diff --git a/pom.xml b/pom.xml index e0ca532..e6d3f57 100644 --- a/pom.xml +++ b/pom.xml @@ -5,21 +5,13 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 33 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-jmx.git - scm:git:git@github.com:NessComputing/components-ness-jmx.git - http://github.com/NessComputing/components-ness-jmx - HEAD - - com.nesscomputing.components ness-jmx ness-jmx - 1.3.2-SNAPSHOT jar JMX related code. @@ -27,31 +19,26 @@ com.nesscomputing.components ness-logging - 1.1.1 com.nesscomputing.components ness-lifecycle - 1.3.0 com.nesscomputing.components ness-galaxy - 1.1.0 com.nesscomputing.components ness-config - 2.3.1 org.jolokia jolokia-core - 1.0.2 @@ -92,7 +79,6 @@ com.googlecode.json-simple json-simple - 1.1 diff --git a/src/main/java/com/nesscomputing/jmx/JmxModule.java b/src/main/java/com/nesscomputing/jmx/JmxModule.java index 06ea255..e6cdfbd 100644 --- a/src/main/java/com/nesscomputing/jmx/JmxModule.java +++ b/src/main/java/com/nesscomputing/jmx/JmxModule.java @@ -19,9 +19,6 @@ import javax.management.MBeanServer; -import org.weakref.jmx.MBeanExporter; -import org.weakref.jmx.guice.MBeanModule; - import com.google.inject.AbstractModule; import com.google.inject.Binder; import com.google.inject.Module; @@ -29,7 +26,9 @@ import com.google.inject.Scopes; import com.google.inject.Singleton; import com.google.inject.util.Modules; -import com.nesscomputing.lifecycle.Lifecycle; + +import org.weakref.jmx.MBeanExporter; +import org.weakref.jmx.guice.MBeanModule; /** * Sets up JMX bindings. Specifically, binds an {@link MBeanExporter} diff --git a/src/main/java/com/nesscomputing/jmx/LifecycledMBeanExporter.java b/src/main/java/com/nesscomputing/jmx/LifecycledMBeanExporter.java index 0de441c..8d0a229 100644 --- a/src/main/java/com/nesscomputing/jmx/LifecycledMBeanExporter.java +++ b/src/main/java/com/nesscomputing/jmx/LifecycledMBeanExporter.java @@ -17,14 +17,15 @@ import javax.management.MBeanServer; -import org.weakref.jmx.MBeanExporter; - import com.google.inject.Inject; import com.google.inject.Singleton; + import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.OnStage; import com.nesscomputing.logging.Log; +import org.weakref.jmx.MBeanExporter; + @Singleton public class LifecycledMBeanExporter extends MBeanExporter diff --git a/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaModule.java b/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaModule.java index e0bff7d..e3d2d8e 100644 --- a/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaModule.java +++ b/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaModule.java @@ -20,14 +20,6 @@ import javax.servlet.http.HttpServlet; -import org.apache.commons.configuration.Configuration; -import org.jolokia.backend.BackendManager; -import org.jolokia.http.HttpRequestHandler; -import org.jolokia.restrictor.AllowAllRestrictor; -import org.jolokia.restrictor.Restrictor; -import org.jolokia.util.ConfigKey; -import org.jolokia.util.LogHandler; - import com.google.common.collect.Maps; import com.google.inject.AbstractModule; import com.google.inject.Inject; @@ -39,6 +31,7 @@ import com.google.inject.Singleton; import com.google.inject.name.Names; import com.google.inject.servlet.ServletModule; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigProvider; import com.nesscomputing.lifecycle.Lifecycle; @@ -46,6 +39,14 @@ import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.logging.Log; +import org.apache.commons.configuration.Configuration; +import org.jolokia.backend.BackendManager; +import org.jolokia.http.HttpRequestHandler; +import org.jolokia.restrictor.AllowAllRestrictor; +import org.jolokia.restrictor.Restrictor; +import org.jolokia.util.ConfigKey; +import org.jolokia.util.LogHandler; + /** * Bind the jolokia servlet in the Trumpet context. */ diff --git a/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaServlet.java b/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaServlet.java index 0679e33..1622f41 100644 --- a/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaServlet.java +++ b/src/main/java/com/nesscomputing/jmx/jolokia/JolokiaServlet.java @@ -25,14 +25,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.google.inject.Inject; +import com.google.inject.Singleton; + import org.jolokia.backend.BackendManager; import org.jolokia.http.HttpRequestHandler; import org.jolokia.util.ConfigKey; import org.json.simple.JSONAware; -import com.google.inject.Inject; -import com.google.inject.Singleton; - /** * Expose Jolokia REST APIs through a Guice driven servlet. */ @@ -42,14 +42,14 @@ public class JolokiaServlet extends HttpServlet private static final long serialVersionUID = 42L; // POST- and GET- HttpRequestHandler - private transient final ServletRequestHandler httpGetHandler; - private transient final ServletRequestHandler httpPostHandler; + private final transient ServletRequestHandler httpGetHandler; + private final transient ServletRequestHandler httpPostHandler; // Backend dispatcher - private transient final BackendManager backendManager; + private final transient BackendManager backendManager; // Request handler for parsing request parameters and building up a response - private transient final HttpRequestHandler requestHandler; + private final transient HttpRequestHandler requestHandler; @Inject public JolokiaServlet(final BackendManager backendManager, @@ -112,7 +112,7 @@ private void sendResponse(final HttpServletResponse resp, final String contentTy writer.flush(); } - private static interface ServletRequestHandler + private interface ServletRequestHandler { JSONAware handleRequest(HttpServletRequest req, HttpServletResponse resp) throws IOException; } diff --git a/src/main/java/com/nesscomputing/jmx/starter/JmxExporter.java b/src/main/java/com/nesscomputing/jmx/starter/JmxExporter.java index 1e28a89..3223f45 100644 --- a/src/main/java/com/nesscomputing/jmx/starter/JmxExporter.java +++ b/src/main/java/com/nesscomputing/jmx/starter/JmxExporter.java @@ -27,6 +27,7 @@ import com.google.inject.Inject; import com.google.inject.name.Named; + import com.nesscomputing.jmx.starter.guice.IOExceptionProvider; import com.nesscomputing.jmx.starter.guice.JmxStarterModule; import com.nesscomputing.lifecycle.LifecycleStage; diff --git a/src/main/java/com/nesscomputing/jmx/starter/guice/JmxExporterConfigProvider.java b/src/main/java/com/nesscomputing/jmx/starter/guice/JmxExporterConfigProvider.java index 2565fbf..8bf0da2 100644 --- a/src/main/java/com/nesscomputing/jmx/starter/guice/JmxExporterConfigProvider.java +++ b/src/main/java/com/nesscomputing/jmx/starter/guice/JmxExporterConfigProvider.java @@ -18,13 +18,14 @@ import java.io.IOException; import java.net.InetAddress; -import org.apache.commons.lang3.ObjectUtils; - import com.google.inject.Inject; + import com.nesscomputing.galaxy.GalaxyConfig; import com.nesscomputing.jmx.starter.JmxExporterConfig; import com.nesscomputing.jmx.starter.NetUtils; +import org.apache.commons.lang3.ObjectUtils; + public class JmxExporterConfigProvider implements IOExceptionProvider { private final InetAddress configuredHost; diff --git a/src/main/java/com/nesscomputing/jmx/starter/guice/JmxStarterModule.java b/src/main/java/com/nesscomputing/jmx/starter/guice/JmxStarterModule.java index 3cafc7d..bb0056e 100644 --- a/src/main/java/com/nesscomputing/jmx/starter/guice/JmxStarterModule.java +++ b/src/main/java/com/nesscomputing/jmx/starter/guice/JmxStarterModule.java @@ -17,8 +17,6 @@ import java.util.Map; -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.ImmutableMap; import com.google.inject.AbstractModule; import com.google.inject.Scopes; @@ -26,11 +24,14 @@ import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.throwingproviders.ThrowingProviderBinder; + import com.nesscomputing.config.Config; import com.nesscomputing.jmx.starter.JmxExporter; import com.nesscomputing.jmx.starter.JmxExporterConfig; import com.nesscomputing.logging.Log; +import org.apache.commons.lang3.StringUtils; + public class JmxStarterModule extends AbstractModule { public static final String JMX_STARTER_NAME = "_jmxStarter"; diff --git a/src/test/java/com/nesscomputing/jmx/jolokia/TestJolokiaModule.java b/src/test/java/com/nesscomputing/jmx/jolokia/TestJolokiaModule.java index 3aec7e1..f9e511b 100644 --- a/src/test/java/com/nesscomputing/jmx/jolokia/TestJolokiaModule.java +++ b/src/test/java/com/nesscomputing/jmx/jolokia/TestJolokiaModule.java @@ -17,17 +17,17 @@ import javax.servlet.http.HttpServlet; -import org.junit.Assert; -import org.junit.Test; - import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Stage; + import com.nesscomputing.config.ConfigModule; -import com.nesscomputing.jmx.jolokia.JolokiaModule; import com.nesscomputing.lifecycle.guice.LifecycleModule; +import org.junit.Assert; +import org.junit.Test; + public class TestJolokiaModule { @Test diff --git a/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxExporterConfigProvider.java b/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxExporterConfigProvider.java index 9fc6b17..1bb8ccc 100644 --- a/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxExporterConfigProvider.java +++ b/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxExporterConfigProvider.java @@ -19,10 +19,6 @@ import javax.management.MBeanServer; -import org.junit.Assert; -import org.junit.Test; -import org.weakref.jmx.testing.TestingMBeanServer; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; @@ -30,11 +26,16 @@ import com.google.inject.Module; import com.google.inject.Scopes; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; import com.nesscomputing.jmx.starter.JmxExporterConfig; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.junit.Assert; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkListen; +import org.weakref.jmx.testing.TestingMBeanServer; @AllowNetworkListen(ports={0}) public class TestJmxExporterConfigProvider diff --git a/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxStarterModule.java b/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxStarterModule.java index 23d5ca3..f2a5caf 100644 --- a/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxStarterModule.java +++ b/src/test/java/com/nesscomputing/jmx/starter/guice/TestJmxStarterModule.java @@ -15,10 +15,6 @@ */ package com.nesscomputing.jmx.starter.guice; -import org.junit.Assert; -import org.junit.Test; -import org.weakref.jmx.testing.TestingMBeanServer; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; @@ -26,6 +22,7 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; @@ -34,8 +31,12 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.junit.Assert; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; +import org.weakref.jmx.testing.TestingMBeanServer; @AllowNetworkListen(ports={0}) @AllowNetworkAccess(endpoints={"0.0.0.0:*","127.0.0.1:*"})