Author: adriancole
Date: Sun Aug 5 18:13:57 2012
New Revision: 1369626
URL: http://svn.apache.org/viewvc?rev=1369626&view=rev
Log:
WHIRR-613. OpenJDK JAVA_HOME detection needs to be improved
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/core/src/main/resources/functions/install_openjdk.sh
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1369626&r1=1369625&r2=1369626&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Sun Aug 5 18:13:57 2012
@@ -884,3 +884,5 @@ Release 0.1.0 - 2010-09-02
WHIRR-611. Cloud providers may only return "public" IPs. (adriancole)
WHIRR-609. Yum install of openjdk needs -y (Andrew Bayer via adriancole)
+
+ WHIRR-613. OpenJDK JAVA_HOME detection needs to be improved (Andrew Bayer
via adriancole)
Modified: whirr/trunk/core/src/main/resources/functions/install_openjdk.sh
URL:
http://svn.apache.org/viewvc/whirr/trunk/core/src/main/resources/functions/install_openjdk.sh?rev=1369626&r1=1369625&r2=1369626&view=diff
==============================================================================
--- whirr/trunk/core/src/main/resources/functions/install_openjdk.sh (original)
+++ whirr/trunk/core/src/main/resources/functions/install_openjdk.sh Sun Aug 5
18:13:57 2012
@@ -19,7 +19,16 @@ function install_openjdk_deb() {
apt-get -y install openjdk-6-jdk
# Try to set JAVA_HOME in a number of commonly used locations
- export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ # Lifting JAVA_HOME detection from jclouds
+ if [ -z "$JAVA_HOME" ]; then
+ for CANDIDATE in `ls -d /usr/lib/jvm/java-1.6.0-openjdk-*
/usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
+ export JAVA_HOME=$CANDIDATE
+ break
+ fi
+ done
+ fi
+
if [ -f /etc/profile ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/profile
fi
@@ -42,10 +51,18 @@ function install_openjdk_deb() {
}
function install_openjdk_rpm() {
- yum -y install java-1.6.0-openjdk
+ yum -y install java-1.6.0-openjdk-devel
# Try to set JAVA_HOME in a number of commonly used locations
- export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ # Lifting JAVA_HOME detection from jclouds
+ if [ -z "$JAVA_HOME" ]; then
+ for CANDIDATE in `ls -d /usr/lib/jvm/java-1.6.0-openjdk-*
/usr/lib/jvm/java-6-openjdk-* /usr/lib/jvm/java-6-openjdk 2>&-`; do
+ if [ -n "$CANDIDATE" -a -x "$CANDIDATE/bin/java" ]; then
+ export JAVA_HOME=$CANDIDATE
+ break
+ fi
+ done
+ fi
if [ -f /etc/profile ]; then
echo export JAVA_HOME=$JAVA_HOME >> /etc/profile
fi
Modified:
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
URL:
http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties?rev=1369626&r1=1369625&r2=1369626&view=diff
==============================================================================
---
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
(original)
+++
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
Sun Aug 5 18:13:57 2012
@@ -21,4 +21,4 @@ whirr.instance-templates=2 zookeeper
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-
+whirr.image-id=us-east-1/ami-aecd60c7
