You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/04/04 18:09:39 UTC
[1/2] activemq-artemis git commit: This closes #438
Repository: activemq-artemis
Updated Branches:
refs/heads/master 6a468b27f -> db56f27fa
This closes #438
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/db56f27f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/db56f27f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/db56f27f
Branch: refs/heads/master
Commit: db56f27fa91cff67ce42b8d3955525a50b4477eb
Parents: 6a468b2 e041c40
Author: jbertram <jb...@apache.org>
Authored: Mon Apr 4 11:09:28 2016 -0500
Committer: jbertram <jb...@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(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-466 Fix java-opts handling
in maven-cli
Posted by jb...@apache.org.
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 <jd...@redhat.com>
Authored: Sun Apr 3 17:35:41 2016 +0200
Committer: jbertram <jb...@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 \