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 2015/09/29 22:59:48 UTC
[1/2] activemq-artemis git commit: This closes #180
Repository: activemq-artemis
Updated Branches:
refs/heads/master 727c91e14 -> dc6fe94bd
This closes #180
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/dc6fe94b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/dc6fe94b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/dc6fe94b
Branch: refs/heads/master
Commit: dc6fe94bd47067fed8634e507643aa7648d44ed5
Parents: 727c91e 6f3b5bd
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Sep 29 16:56:15 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 29 16:56:15 2015 -0400
----------------------------------------------------------------------
artemis-distribution/src/main/resources/bin/artemis | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: JAVA_HOME fix
Posted by cl...@apache.org.
JAVA_HOME fix
Putting the right JAVA_HOME correct atribution - Mac OS support
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6f3b5bde
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6f3b5bde
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6f3b5bde
Branch: refs/heads/master
Commit: 6f3b5bdeb64c38134e675787f83d44c78aa281af
Parents: 727c91e
Author: Glaucio Melo <gl...@users.noreply.github.com>
Authored: Tue Sep 29 15:57:41 2015 -0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Sep 29 16:56:15 2015 -0400
----------------------------------------------------------------------
artemis-distribution/src/main/resources/bin/artemis | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6f3b5bde/artemis-distribution/src/main/resources/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index 296fb29..96af7af 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -58,7 +58,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