You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2012/02/23 06:14:47 UTC

svn commit: r1292649 - in /whirr/branches/branch-0.7: ./ core/src/main/resources/functions/ services/cassandra/src/main/java/org/apache/whirr/service/cassandra/ services/cdh/ services/cdh/src/test/resources/ services/elasticsearch/src/main/java/org/apa...

Author: asavu
Date: Thu Feb 23 05:14:46 2012
New Revision: 1292649

URL: http://svn.apache.org/viewvc?rev=1292649&view=rev
Log:
WHIRR-518. Change to OpenJDK (Frank Scholten, Tom White, Andrei Savu)

Removed:
    whirr/branches/branch-0.7/core/src/main/resources/functions/install_java.sh
Modified:
    whirr/branches/branch-0.7/CHANGES.txt
    whirr/branches/branch-0.7/core/src/main/resources/functions/install_tarball.sh
    whirr/branches/branch-0.7/pom.xml
    whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
    whirr/branches/branch-0.7/services/cdh/pom.xml
    whirr/branches/branch-0.7/services/cdh/src/test/resources/whirr-hbase-test.properties
    whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
    whirr/branches/branch-0.7/services/hadoop/pom.xml
    whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
    whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
    whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
    whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
    whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test.properties
    whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
    whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
    whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
    whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
    whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
    whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java

Modified: whirr/branches/branch-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Thu Feb 23 05:14:46 2012
@@ -33,6 +33,8 @@ Release 0.7.1
 
     WHIRR-520. Using OAB script to install sun jdk (Marco Didonna via asavu)
 
+    WHIRR-518. Change to OpenJDK (Frank Scholten, Tom White, Andrei Savu)
+
 Release 0.7.0 - 2011-12-11
 
   NEW FEATURES

Modified: whirr/branches/branch-0.7/core/src/main/resources/functions/install_tarball.sh
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/core/src/main/resources/functions/install_tarball.sh?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/core/src/main/resources/functions/install_tarball.sh (original)
+++ whirr/branches/branch-0.7/core/src/main/resources/functions/install_tarball.sh Thu Feb 23 05:14:46 2012
@@ -25,10 +25,10 @@ function install_tarball() {
     local target=${2:-/usr/local/}
     mkdir -p $target
 
-    local curl="curl -L --silent --show-error --fail --connect-timeout 10 --max-time 600 --retry 5"
-    # any download should take less than 10 minutes
+    local curl="curl -L --silent --show-error --fail --connect-timeout 20 --max-time 1200 --retry 5"
+    # any download should take less than 20 minutes
 
-    for retry_count in `seq 1 3`;
+    for retry_count in `seq 1 20`;
     do
       $curl -O $tar_url || true
       $curl -O $tar_url.md5 || true
@@ -47,7 +47,7 @@ function install_tarball() {
         rm -f $tar_file $tar_file_md5
       fi
 
-      if [ ! $retry_count -eq "3" ]; then
+      if [ ! $retry_count -eq "20" ]; then
         sleep 10
       fi
     done

Modified: whirr/branches/branch-0.7/pom.xml
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/pom.xml?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/pom.xml (original)
+++ whirr/branches/branch-0.7/pom.xml Thu Feb 23 05:14:46 2012
@@ -190,6 +190,18 @@
         <artifactId>dnsjava</artifactId>
         <version>2.1.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>1.5.2</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-mapper-asl</artifactId>
+        <version>1.5.2</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -57,7 +57,7 @@ public class CassandraClusterActionHandl
     ClusterSpec clusterSpec = event.getClusterSpec();
     Configuration conf = clusterSpec.getConfiguration();
     
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     addStatement(event, call("install_service"));

Modified: whirr/branches/branch-0.7/services/cdh/pom.xml
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/cdh/pom.xml?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/cdh/pom.xml (original)
+++ whirr/branches/branch-0.7/services/cdh/pom.xml Thu Feb 23 05:14:46 2012
@@ -127,13 +127,11 @@
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-core-asl</artifactId>
-      <version>1.5.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
       <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.5.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: whirr/branches/branch-0.7/services/cdh/src/test/resources/whirr-hbase-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/cdh/src/test/resources/whirr-hbase-test.properties?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/cdh/src/test/resources/whirr-hbase-test.properties (original)
+++ whirr/branches/branch-0.7/services/cdh/src/test/resources/whirr-hbase-test.properties Thu Feb 23 05:14:46 2012
@@ -18,6 +18,7 @@
 whirr.cluster-name=hbase-cdh-itest-${sys:whirr.test.provider}-${sys:user.name}
 
 whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker+zookeeper+hbase-master+hbase-thriftserver,1 hadoop-datanode+hadoop-tasktracker+hbase-regionserver
+whirr.hardware-min-ram=2048
 
 whirr.provider=${sys:whirr.test.provider}
 whirr.identity=${sys:whirr.test.identity}

Modified: whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java (original)
+++ whirr/branches/branch-0.7/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java Thu Feb 23 05:14:46 2012
@@ -46,7 +46,7 @@ public class ElasticSearchHandler extend
     ClusterSpec spec = event.getClusterSpec();
     Configuration config = spec.getConfiguration();
 
-    addStatement(event, call(getInstallFunction(config, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(config, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String tarurl = prepareRemoteFileUrl(event,

Modified: whirr/branches/branch-0.7/services/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/pom.xml?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/pom.xml (original)
+++ whirr/branches/branch-0.7/services/hadoop/pom.xml Thu Feb 23 05:14:46 2012
@@ -100,6 +100,16 @@
       <version>${hadoop.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -67,7 +67,7 @@ public abstract class HadoopClusterActio
 
     addStatement(event, call("configure_hostnames"));
 
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String tarball = prepareRemoteFileUrl(event,

Modified: whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopConfigurationConverter.java Thu Feb 23 05:14:46 2012
@@ -72,6 +72,7 @@ public class HadoopConfigurationConverte
   @VisibleForTesting
   static List<String> asEnvironmentVariablesLines(Configuration hadoopConfig) {
     List<String> lines = Lists.newArrayList();
+    lines.add(". /etc/profile");
     
     for (@SuppressWarnings("unchecked")
         Iterator<String> it = hadoopConfig.getKeys(); it.hasNext(); ) {

Modified: whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-separate.properties Thu Feb 23 05:14:46 2012
@@ -16,9 +16,13 @@
 # limitations under the License.
 #
 whirr.cluster-name=hadoop-separate-itest-${sys:whirr.test.provider}-${sys:user.name}
-whirr.instance-templates=1 hadoop-jobtracker,1 hadoop-namenode,1 hadoop-datanode,1 hadoop-tasktracker
+whirr.instance-templates=1 hadoop-namenode,1 hadoop-jobtracker,1 hadoop-datanode,1 hadoop-tasktracker
 
 whirr.provider=${sys:whirr.test.provider}
 whirr.identity=${sys:whirr.test.identity}
 whirr.credential=${sys:whirr.test.credential}
 
+whirr.hadoop.version=0.20.205.0
+whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
+
+

Modified: whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test-single.properties Thu Feb 23 05:14:46 2012
@@ -16,9 +16,13 @@
 # limitations under the License.
 #
 whirr.cluster-name=hadoop-single-itest-${sys:whirr.test.provider}-${sys:user.name}
-whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode+hadoop-datanode+hadoop-tasktracker
+whirr.instance-templates=1 hadoop-namenode+hadoop-datanode+hadoop-jobtracker+hadoop-tasktracker
+whirr.hardware-min-ram=2048
 
 whirr.provider=${sys:whirr.test.provider}
 whirr.identity=${sys:whirr.test.identity}
 whirr.credential=${sys:whirr.test.credential}
 
+whirr.hadoop.version=0.20.205.0
+whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
+

Modified: whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test.properties
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test.properties?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test.properties (original)
+++ whirr/branches/branch-0.7/services/hadoop/src/test/resources/whirr-hadoop-test.properties Thu Feb 23 05:14:46 2012
@@ -16,8 +16,12 @@
 # limitations under the License.
 #
 whirr.cluster-name=hadoop-itest-${sys:whirr.test.provider}-${sys:user.name}
-whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1 hadoop-datanode+hadoop-tasktracker
+whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,1 hadoop-datanode+hadoop-tasktracker
+whirr.hardware-min-ram=2048
 
 whirr.provider=${sys:whirr.test.provider}
 whirr.identity=${sys:whirr.test.identity}
 whirr.credential=${sys:whirr.test.credential}
+
+whirr.hadoop.version=0.20.205.0
+whirr.hadoop.tarball.url=http://archive.apache.org/dist/hadoop/core/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz

Modified: whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -46,7 +46,7 @@ public abstract class HamaClusterActionH
     Configuration conf = getConfiguration(clusterSpec);
 
     addStatement(event, call("configure_hostnames"));
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String hamaInstallFunction = conf.getString(

Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -58,7 +58,7 @@ public class BasicServerClusterActionHan
     Configuration conf = getConfiguration(clusterSpec);
 
     addStatement(event, call("configure_hostnames"));
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String tarurl = prepareRemoteFileUrl(event,

Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -66,7 +66,7 @@ public class HBaseMasterClusterActionHan
 
     addStatement(event, call("configure_hostnames"));
 
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String tarurl = prepareRemoteFileUrl(event,

Modified: whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -54,7 +54,7 @@ public class HBaseRegionServerClusterAct
 
     addStatement(event, call("configure_hostnames"));
 
-    addStatement(event, call(getInstallFunction(conf, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(conf, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
 
     String tarurl = prepareRemoteFileUrl(event,

Modified: whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -79,7 +79,7 @@ public class VoldemortClusterActionHandl
       optArgs.add(prepareRemoteFileUrl(event, confUrl));
     }
 
-    addStatement(event, call(getInstallFunction(config, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(config, "java", "install_openjdk")));
     addStatement(event, call("install_service"));
 
     addStatement(event, call(FUNCTION_INSTALL, optArgs.toArray(new String[optArgs.size()])));

Modified: whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1292649&r1=1292648&r2=1292649&view=diff
==============================================================================
--- whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ whirr/branches/branch-0.7/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Thu Feb 23 05:14:46 2012
@@ -73,7 +73,7 @@ public class ZooKeeperClusterActionHandl
     ClusterSpec clusterSpec = event.getClusterSpec();
     Configuration config = getConfiguration(clusterSpec);
 
-    addStatement(event, call(getInstallFunction(config, "java", "install_java")));
+    addStatement(event, call(getInstallFunction(config, "java", "install_openjdk")));
     addStatement(event, call("install_tarball"));
     addStatement(event, call("install_service"));