You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2011/08/17 16:39:20 UTC
svn commit: r1158745 - in /activemq/trunk:
activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
assembly/src/release/bin/activemq-admin
Author: gtully
Date: Wed Aug 17 14:39:20 2011
New Revision: 1158745
URL: http://svn.apache.org/viewvc?rev=1158745&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3456: Update activemq-admin usage to include info on how to change JMX access
Modified:
activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
activemq/trunk/assembly/src/release/bin/activemq-admin
Modified: activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java?rev=1158745&r1=1158744&r2=1158745&view=diff
==============================================================================
--- activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java (original)
+++ activemq/trunk/activemq-console/src/main/java/org/apache/activemq/console/command/ShellCommand.java Wed Aug 17 14:39:20 2011
@@ -40,7 +40,7 @@ public class ShellCommand extends Abstra
this.helpFile = new String[] {
interactive ? "Usage: [task] [task-options] [task data]" : "Usage: Main [--extdir <dir>] [task] [task-options] [task data]",
"",
- "Tasks (default task is start):",
+ "Tasks:",
" start - Creates and starts a broker using a configuration file, or a broker URI.",
" create - Creates a runnable broker instance in the specified path",
" stop - Stops a running broker specified by the broker name.",
@@ -59,6 +59,11 @@ public class ShellCommand extends Abstra
"",
"Task Data:",
" - Information needed by each specific task.",
+ "",
+ "JMX system property options:",
+ " -Dactivemq.jmx.url=<jmx service uri> (default is: 'service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi')",
+ " -Dactivemq.jmx.user=<user name>",
+ " -Dactivemq.jmx.password=<password>",
""
};
}
Modified: activemq/trunk/assembly/src/release/bin/activemq-admin
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin?rev=1158745&r1=1158744&r2=1158745&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin Wed Aug 17 14:39:20 2011
@@ -129,7 +129,7 @@ fi
# Set default classpath
ACTIVEMQ_CLASSPATH="${ACTIVEMQ_BASE}/conf;"$ACTIVEMQ_CLASSPATH
-if [ $1 = "start" ] ; then
+if [ ""$1 = "start" ] ; then
if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Djava.util.logging.config.file=logging.properties"
fi