You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by fa...@apache.org on 2013/03/25 22:24:10 UTC

git commit: BIGTOP-883. Add support for Oracle RPM Java 1.7

Updated Branches:
  refs/heads/master 920121c63 -> b8e4e4ccc


BIGTOP-883. Add support for Oracle RPM Java 1.7


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b8e4e4cc
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b8e4e4cc
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b8e4e4cc

Branch: refs/heads/master
Commit: b8e4e4ccc053cfc532b5b0a4261cb709db5f7902
Parents: 920121c
Author: Anatoli Fomenko <fa...@apache.org>
Authored: Mon Mar 25 14:12:20 2013 -0700
Committer: Anatoli Fomenko <fa...@apache.org>
Committed: Mon Mar 25 14:23:21 2013 -0700

----------------------------------------------------------------------
 .../src/common/bigtop-utils/bigtop-detect-javahome |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b8e4e4cc/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
index b818afa..f805611 100644
--- a/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
+++ b/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
@@ -30,6 +30,8 @@ if [ -z "$JAVA_HOME" ]; then
     /usr/lib/jvm/j2sdk1.6-oracle/jre \
     /usr/java/jdk1.6* \
     /usr/java/jre1.6* \
+    /usr/java/jdk1.7* \
+    /usr/java/jre1.7* \
     /Library/Java/Home \
     /usr/java/default \
     /usr/lib/jvm/default-java \