svn commit: r1236227 - in /activemq/trunk: activemq-core/src/test/resources/log4j.properties activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java

[dejanb]

Author: dejanb
Date: Thu Jan 26 15:10:57 2012
New Revision: 1236227

URL: http://svn.apache.org/viewvc?rev=1236227&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3682 - use jmxLocal for karaf 
commands by default

Modified:
    activemq/trunk/activemq-core/src/test/resources/log4j.properties
    
activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java

Modified: activemq/trunk/activemq-core/src/test/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/log4j.properties?rev=1236227&r1=1236226&r2=1236227&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-core/src/test/resources/log4j.properties Thu Jan 26 
15:10:57 2012
@@ -22,7 +22,7 @@ log4j.rootLogger=INFO, out, stdout
 
 #log4j.logger.org.apache.activemq.broker.scheduler=DEBUG
 #log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG
-#log4j.logger.org.apache.activemq=TRACE
+log4j.logger.org.apache.activemq.transport.failover=TRACE
 #log4j.logger.org.apache.activemq.store.jdbc=TRACE
 
#log4j.logger.org.apache.activemq.broker.region.cursors.AbstractStoreCursor=DEBUG
 #log4j.logger.org.apache.activemq.store.jdbc.JDBCMessageStore=DEBUG

Modified: 
activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java?rev=1236227&r1=1236226&r2=1236227&view=diff
==============================================================================
--- 
activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
 (original)
+++ 
activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommandSupport.java
 Thu Jan 26 15:10:57 2012
@@ -16,15 +16,13 @@
  */
 package org.apache.activemq.karaf.commands;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-
+import org.apache.activemq.console.CommandContext;
 import org.apache.activemq.console.command.Command;
 import org.apache.activemq.console.formatter.CommandShellOutputFormatter;
-import org.apache.activemq.console.CommandContext;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.apache.felix.gogo.commands.Argument;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
+
+import java.util.ArrayList;
 
 /**
  * @version $Rev: 960482 $ $Date: 2010-07-05 10:28:33 +0200 (Mon, 05 Jul 2010) 
$
@@ -34,7 +32,7 @@ public class ActiveMQCommandSupport exte
     private Command command;
 
     @Argument(index=0, multiValued=true, required=true)
-    private Collection<String> arguments;
+    private ArrayList<String> arguments = new ArrayList<String>();
 
     protected Object doExecute() throws Exception {
         CommandContext context2 = new CommandContext();
@@ -43,7 +41,8 @@ public class ActiveMQCommandSupport exte
 
         try {
             currentCommand.setCommandContext(context2);
-            currentCommand.execute(arguments != null ? new 
ArrayList<String>(arguments) : new ArrayList<String>());
+            arguments.add("--jmxlocal");
+            currentCommand.execute(arguments);
             return null;
         } catch (Throwable e) {
             Throwable cur = e;