activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-466 Fix java-opts handling in maven-cli
Date Mon, 04 Apr 2016 16:09:40 GMT
ARTEMIS-466 Fix java-opts handling in maven-cli

Previously, java-opts (--java-options argument on the command line)
were not passed on to Artemis broker. This broke the client-kickoff
example, which relies on this to configure JMX.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e041c40f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e041c40f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e041c40f

Branch: refs/heads/master
Commit: e041c40ffd07027268a39ef365aeadac593680a7
Parents: 6a468b2
Author: Jiri Danek <jdanek@redhat.com>
Authored: Sun Apr 3 17:35:41 2016 +0200
Committer: jbertram <jbertram@apache.org>
Committed: Mon Apr 4 11:09:28 2016 -0500

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/cli/commands/bin/artemis          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e041c40f/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 ec9b95e..ccbd8f2 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,7 +105,8 @@ if $cygwin ; then
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-exec "$JAVACMD" $JAVA_ARGS \
+exec "$JAVACMD" ${java-opts} \
+    $JAVA_ARGS \
     -Xbootclasspath/a:"$ARTEMIS_HOME/lib/${logmanager}" \
     -Djava.security.auth.login.config="$ARTEMIS_INSTANCE/etc/login.config" \
     $ARTEMIS_CLUSTER_PROPS \


Mime
View raw message