Author: rvs
Date: Sat Apr 28 00:31:09 2012
New Revision: 1331642
URL: http://svn.apache.org/viewvc?rev=1331642&view=rev
Log:
BIGTOP-567. Make sure we can detect the JAVA_HOME for java-package built JDK
package
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=1331642&r1=1331641&r2=1331642&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
Sat Apr 28 00:31:09 2012
@@ -25,6 +25,8 @@ if [ -z "$JAVA_HOME" ]; then
/usr/lib/jvm/java-6-sun \
/usr/lib/jvm/java-1.6.0-sun-1.6.0.*/jre/ \
/usr/lib/jvm/java-1.6.0-sun-1.6.0.* \
+ /usr/lib/jvm/j2sdk1.6-oracle \
+ /usr/lib/jvm/j2sdk1.6-oracle/jre \
/usr/lib/j2sdk1.6-sun \
/usr/java/jdk1.6* \
/usr/java/jre1.6* \
