You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/12/18 04:17:37 UTC
[4/8] activemq git commit:
https://issues.apache.org/jira/browse/AMQ-5121 - use jmxLocal in karaf only
for jmx-based commands
https://issues.apache.org/jira/browse/AMQ-5121 - use jmxLocal in karaf only for jmx-based commands
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a0af997b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a0af997b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a0af997b
Branch: refs/heads/activemq-5.10.x
Commit: a0af997baa16ea7e00ace521109de805bae08e7a
Parents: a194616
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Thu Sep 18 15:25:22 2014 +0200
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Dec 17 21:49:18 2014 -0500
----------------------------------------------------------------------
.../apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java | 1 +
.../apache/activemq/karaf/commands/ActiveMQCommandSupport.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a0af997b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
index ede449e..3015fd1 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
@@ -67,6 +67,7 @@ public class ActiveMQBrokerFeatureTest extends AbstractJmsFeatureTest {
produceMessage(nameAndPayload);
System.err.println(executeCommand("activemq:bstat").trim());
+ assertEquals("JMS_BODY_FIELD:JMSText = " + nameAndPayload, executeCommand("activemq:browse --amqurl tcp://localhost:61616 --user karaf --password karaf -Vbody " + nameAndPayload).trim());
assertEquals("got our message", nameAndPayload, consumeMessage(nameAndPayload));
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a0af997b/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java b/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
index c05e7d0..58986c5 100644
--- a/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
+++ b/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
@@ -17,6 +17,7 @@
package org.apache.activemq.karaf.commands;
import org.apache.activemq.console.CommandContext;
+import org.apache.activemq.console.command.AbstractJmxCommand;
import org.apache.activemq.console.command.Command;
import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
import org.apache.felix.gogo.commands.Argument;
@@ -42,7 +43,9 @@ public class ActiveMQCommandSupport extends OsgiCommandSupport {
try {
currentCommand.setCommandContext(context2);
// must be added first
- arguments.add(0, "--jmxlocal");
+ if (command instanceof AbstractJmxCommand) {
+ arguments.add(0, "--jmxlocal");
+ }
currentCommand.execute(arguments);
return null;
} catch (Throwable e) {