Repository: activemq-artemis Updated Branches: refs/heads/master 8c0aa41db -> 044e8e115
Cleaner fix for: ARTEMIS-318 Can't stop broker when remote JMX enabled Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/044e8e11 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/044e8e11 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/044e8e11 Branch: refs/heads/master Commit: 044e8e115924a4840fe48c0cd28d09ba8e492a94 Parents: 8c0aa41 Author: Hiram Chirino <hi...@hiramchirino.com> Authored: Mon Jan 18 11:31:55 2016 -0500 Committer: Hiram Chirino <hi...@hiramchirino.com> Committed: Mon Jan 18 11:31:55 2016 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/artemis/cli/commands/bin/artemis | 5 ----- .../apache/activemq/artemis/cli/commands/etc/artemis.profile | 7 ++++++- .../activemq/artemis/cli/commands/etc/artemis.profile.cmd | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis index 2c717fd..a81cf19 100755 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis @@ -105,11 +105,6 @@ if $cygwin ; then CLASSPATH=`cygpath --windows "$CLASSPATH"` fi -# Empty JAVA_ARGS unless the command is 'run' or 'data'. See https://issues.apache.org/jira/browse/ARTEMIS-318. -if [ "$1" != "run" -a "$1" != "data" ]; then - JAVA_ARGS="" -fi - exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \ -classpath "$CLASSPATH" \ -Dartemis.home="$ARTEMIS_HOME" \ http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile index f734691..d071c9f 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile @@ -22,10 +22,15 @@ ARTEMIS_INSTANCE='${artemis.instance}' #ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446" - # Java Opts JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} -Djava.security.auth.login.config=$ARTEMIS_INSTANCE/etc/login.config ${java-opts} -Dartemis.instance=$ARTEMIS_INSTANCE" +# +# There might be options that you only want to enable on specifc commands, like setting a JMX port +# See https://issues.apache.org/jira/browse/ARTEMIS-318 +#if [ "$1" == "run" ]; then +# JAVA_ARGS="$JAVA_ARGS -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false" +#fi # Debug args: Uncomment to enable debug #DEBUG_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd index a60d470..604011c 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd @@ -24,5 +24,9 @@ rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq. rem Java Opts set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config ${java-opts} -Dartemis.instance=%ARTEMIS_INSTANCE% +rem There might be options that you only want to enable on specifc commands, like setting a JMX port +rem See https://issues.apache.org/jira/browse/ARTEMIS-318 +rem if "%1"=="run" set JAVA_ARGS=%JAVA_ARGS% -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false + rem Debug args: Uncomment to enable debug rem set DEBUG_ARGS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
