Repository: camel Updated Branches: refs/heads/master ba900f721 -> 31473bce1
CAMEL-8044: Camel commands useable for remote JVMs using jolokia Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/31473bce Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/31473bce Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/31473bce Branch: refs/heads/master Commit: 31473bce1e84f870d400506d0f6c68346f86dd98 Parents: ba900f7 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 17 12:17:27 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 17 12:17:27 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/commands/jolokia/JolokiaClientFactory.java | 7 +++++++ .../apache/camel/commands/jolokia/JolokiaRemoteTest.java | 9 +++++++++ .../commands-jolokia/src/test/resources/log4j.properties | 2 ++ 3 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/31473bce/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java index 98c23ef..69a9ac0 100644 --- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java +++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/JolokiaClientFactory.java @@ -16,6 +16,7 @@ */ package org.apache.camel.commands.jolokia; +import org.jolokia.client.BasicAuthenticator; import org.jolokia.client.J4pClient; import org.jolokia.client.J4pClientBuilder; import org.slf4j.Logger; @@ -37,11 +38,17 @@ public final class JolokiaClientFactory { LOG.info("Creating jolokia client at URL: {}", jolokiaUrl); J4pClientBuilder builder = J4pClient.url(jolokiaUrl); + boolean auth = false; if (isNotEmpty(username)) { builder = builder.user(username); + auth = true; } if (isNotEmpty(password)) { builder = builder.password(password); + auth = true; + } + if (auth) { + builder = builder.authenticator(new BasicAuthenticator(true)); } return builder.build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/31473bce/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java index 5be597b..57cc919 100644 --- a/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java +++ b/platforms/commands/commands-jolokia/src/test/java/org/apache/camel/commands/jolokia/JolokiaRemoteTest.java @@ -30,6 +30,15 @@ public class JolokiaRemoteTest { private JolokiaCamelController controller; @Test + public void testPing() throws Exception { + controller = new DefaultJolokiaCamelController(); + controller.connect(url, null, null); + + boolean pong = controller.ping(); + System.out.println("Ping responsed: " + pong); + } + + @Test public void testRemoteCamelContexts() throws Exception { controller = new DefaultJolokiaCamelController(); controller.connect(url, null, null); http://git-wip-us.apache.org/repos/asf/camel/blob/31473bce/platforms/commands/commands-jolokia/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/test/resources/log4j.properties b/platforms/commands/commands-jolokia/src/test/resources/log4j.properties index b8ef5dc..cc46af0 100644 --- a/platforms/commands/commands-jolokia/src/test/resources/log4j.properties +++ b/platforms/commands/commands-jolokia/src/test/resources/log4j.properties @@ -22,6 +22,8 @@ log4j.rootLogger=INFO, out # uncomment the following to enable camel debugging log4j.logger.org.apache.camel.commands=DEBUG +#log4j.logger.org.jolokia=DEBUG +#log4j.logger.org.apache.http=DEBUG # CONSOLE appender not used by default log4j.appender.out=org.apache.log4j.ConsoleAppender
