Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6C2F5200B6B for ; Thu, 25 Aug 2016 20:35:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6AE47160AA5; Thu, 25 Aug 2016 18:35:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BC227160AA4 for ; Thu, 25 Aug 2016 20:35:22 +0200 (CEST) Received: (qmail 61054 invoked by uid 500); 25 Aug 2016 18:35:22 -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 61031 invoked by uid 99); 25 Aug 2016 18:35:21 -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; Thu, 25 Aug 2016 18:35:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D258EE055D; Thu, 25 Aug 2016 18:35:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 25 Aug 2016 18:35:21 -0000 Message-Id: <924d4b8bdc8e4f84ab020b8dda7fef3c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-700 Improving how the log manager is found on Posix systems archived-at: Thu, 25 Aug 2016 18:35:23 -0000 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 Authored: Thu Aug 25 11:24:52 2016 -0400 Committer: Clebert Suconic 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" \