From e041c40ffd07027268a39ef365aeadac593680a7 Mon Sep 17 00:00:00 2001
From: Jiri Danek <jdanek@redhat.com>
Date: Sun, 3 Apr 2016 17:35:41 +0200
Subject: [PATCH] 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.
---
 .../org/apache/activemq/artemis/cli/commands/bin/artemis       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ec9b95e935..ccbd8f237f 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 \