activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: JAVA_HOME fix at artemis-cli
Date Thu, 01 Oct 2015 13:33:05 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 0fb518369 -> a45f89bb8


JAVA_HOME fix at artemis-cli

After create a broker using main artemis script, this one needs to be created using JAVA_HOME
environment correctly as well, otherwise the broker will be unable to find java_home. 
I did perform a search at the whole project and this is the only remaining place which needs
to change the JAVA_HOME value at the script.

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/800c42bc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/800c42bc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/800c42bc

Branch: refs/heads/master
Commit: 800c42bc240f11773f9ccb8933f5da8e862ed72d
Parents: 0fb5183
Author: Glaucio Melo <glaucio-melo-movile@users.noreply.github.com>
Authored: Thu Oct 1 10:28:52 2015 -0300
Committer: Glaucio Melo <glaucio-melo-movile@users.noreply.github.com>
Committed: Thu Oct 1 10:28:52 2015 -0300

----------------------------------------------------------------------
 .../resources/org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/800c42bc/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 4173f87..a81cf19 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
@@ -64,7 +64,7 @@ case "`uname`" in
     ;;
   Darwin*) darwin=true
     if [ -z "$JAVA_HOME" ] ; then
-     JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+     JAVA_HOME=$(/usr/libexec/java_home)
     fi
     ;;
 esac


Mime
View raw message