Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 22E0219732 for ; Mon, 4 Apr 2016 16:09:40 +0000 (UTC) Received: (qmail 7341 invoked by uid 500); 4 Apr 2016 16:09:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 7215 invoked by uid 500); 4 Apr 2016 16:09:40 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 7199 invoked by uid 99); 4 Apr 2016 16:09:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2016 16:09:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DF9AADFF81; Mon, 4 Apr 2016 16:09:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbertram@apache.org To: commits@activemq.apache.org Date: Mon, 04 Apr 2016 16:09:40 -0000 Message-Id: <3379cb56eaf5424683b7f8b7b47da7f4@git.apache.org> In-Reply-To: <4677b5e071d549aeb97d5c2d73c294ac@git.apache.org> References: <4677b5e071d549aeb97d5c2d73c294ac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: ARTEMIS-466 Fix java-opts handling in maven-cli 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 Authored: Sun Apr 3 17:35:41 2016 +0200 Committer: jbertram 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 \