Repository: activemq Updated Branches: refs/heads/trunk d77014aa5 -> f5ddcf06d
https://issues.apache.org/jira/browse/AMQ-5128 - provide SSL_OPTS to all tasks Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f5ddcf06 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f5ddcf06 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f5ddcf06 Branch: refs/heads/trunk Commit: f5ddcf06d714d2eebefabd288909a8530a0c54c6 Parents: d77014a Author: Dejan Bosanac <[email protected]> Authored: Mon Mar 31 12:52:46 2014 +0200 Committer: Dejan Bosanac <[email protected]> Committed: Mon Mar 31 12:52:59 2014 +0200 ---------------------------------------------------------------------- assembly/src/release/bin/activemq | 4 +--- assembly/src/release/bin/activemq-admin | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f5ddcf06/assembly/src/release/bin/activemq ---------------------------------------------------------------------- diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq index ed34126..c1a04ea 100755 --- a/assembly/src/release/bin/activemq +++ b/assembly/src/release/bin/activemq @@ -621,16 +621,14 @@ invoke_stop(){ # - $ACTIVEMQ_SUNJMX_START : options for JMX settings # - $ACTIVEMQ_SSL_OPTS : options for SSL encryption invoke_task(){ + ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS" # call task in java binary if ( checkRunning );then if [ "$1" = "browse" ] && [ -n "$ACTIVEMQ_QUEUEMANAGERURL" ];then - ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS" COMMANDLINE_ARGS="$1 $ACTIVEMQ_QUEUEMANAGERURL `echo $COMMANDLINE_ARGS|sed 's,^browse,,'`" elif [ "$1" = "query" ] && [ -n "$ACTIVEMQ_QUEUEMANAGERURL" ];then - ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS" COMMANDLINE_ARGS="$1 $ACTIVEMQ_SUNJMX_CONTROL `echo $COMMANDLINE_ARGS|sed 's,^query,,'`" else - ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $ACTIVEMQ_SSL_OPTS" COMMANDLINE_ARGS="$COMMANDLINE_ARGS $ACTIVEMQ_SUNJMX_CONTROL" fi invokeJar http://git-wip-us.apache.org/repos/asf/activemq/blob/f5ddcf06/assembly/src/release/bin/activemq-admin ---------------------------------------------------------------------- diff --git a/assembly/src/release/bin/activemq-admin b/assembly/src/release/bin/activemq-admin index 19c7749..cbe2aef 100644 --- a/assembly/src/release/bin/activemq-admin +++ b/assembly/src/release/bin/activemq-admin @@ -156,9 +156,11 @@ if [ ""$1 = "start" ] ; then SUNJMX="-Dcom.sun.management.jmxremote" fi - ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX $SSL_OPTS -Djava.io.tmpdir="${ACTIVEMQ_TMP}"" + ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SUNJMX -Djava.io.tmpdir="${ACTIVEMQ_TMP}"" fi +ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS $SSL_OPTS" + # Uncomment to enable YourKit profiling #ACTIVEMQ_DEBUG_OPTS="-agentlib:yjpagent"
