You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/25 18:35:21 UTC
[1/2] activemq-artemis git commit: ARTEMIS-700 Improving how the log
manager is found on Posix systems
Repository: activemq-artemis
Updated Branches:
refs/heads/master 0a8c118a1 -> 986880f4c
ARTEMIS-700 Improving how the log manager is found on Posix systems
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/248ae383
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/248ae383
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/248ae383
Branch: refs/heads/master
Commit: 248ae383df38a3e549651393af2ae0463f6c7273
Parents: 0a8c118
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 25 11:24:52 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:34:50 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/bin/artemis | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/248ae383/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 10da1c9..8129341 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
@@ -96,9 +96,18 @@ if $cygwin ; then
CLASSPATH=`cygpath --windows "$CLASSPATH"`
fi
+
+# finding the Log Manager
+LOG_MANAGER=`ls $ARTEMIS_HOME/lib/jboss-logmanager*jar 2>/dev/null`
+
+if [ -z "$LOG_MANAGER" ] ; then
+ # this is the one found when the server was created
+ LOG_MANAGER="$ARTEMIS_HOME/lib/${logmanager}"
+fi
+
exec "$JAVACMD" ${java-opts} \
$JAVA_ARGS \
- -Xbootclasspath/a:"$ARTEMIS_HOME/lib/${logmanager}" \
+ -Xbootclasspath/a:"$LOG_MANAGER" \
-Djava.security.auth.login.config="$ARTEMIS_INSTANCE/etc/login.config" \
$ARTEMIS_CLUSTER_PROPS \
-classpath "$CLASSPATH" \
[2/2] activemq-artemis git commit: This closes #735
Posted by cl...@apache.org.
This closes #735
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/986880f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/986880f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/986880f4
Branch: refs/heads/master
Commit: 986880f4c32002fb042c471359e4c4618c6b711b
Parents: 0a8c118 248ae38
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 25 14:35:14 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 25 14:35:14 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/bin/artemis | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------