Author: rvs
Date: Fri Jun 1 21:18:56 2012
New Revision: 1345356
URL: http://svn.apache.org/viewvc?rev=1345356&view=rev
Log:
BIGTOP-609. add support for openjdk 1.7
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome?rev=1345356&r1=1345355&r2=1345356&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-utils/bigtop-detect-javahome
Fri Jun 1 21:18:56 2012
@@ -35,6 +35,8 @@ if [ -z "$JAVA_HOME" ]; then
/usr/lib/jvm/default-java \
/usr/lib/jvm/java-openjdk \
/usr/lib/jvm/jre-openjdk \
+ /usr/lib/jvm/java-1.7.0-openjdk* \
+ /usr/lib/jvm/java-7-openjdk* \
/usr/lib/jvm/java-1.6.0-openjdk \
/usr/lib/jvm/java-1.6.0-openjdk-* \
/usr/lib/jvm/jre-1.6.0-openjdk* ; do
