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/20 12:33:58 UTC
svn commit: r1291210 - in /whirr/trunk: ./ core/src/main/resources/functions/
services/cassandra/src/main/java/org/apache/whirr/service/cassandra/
services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/
services/hadoop/src/main/jav...
Author: asavu
Date: Mon Feb 20 11:33:58 2012
New Revision: 1291210
URL: http://svn.apache.org/viewvc?rev=1291210&view=rev
Log:
WHIRR-518. Change to OpenJDK (Frank Scholten via asavu)
Removed:
whirr/trunk/core/src/main/resources/functions/install_java.sh
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
whirr/trunk/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
whirr/trunk/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Mon Feb 20 11:33:58 2012
@@ -63,6 +63,8 @@ Trunk (unreleased changes)
WHIRR-507. Make whirr script executable from any path (Marco Didonna via asavu)
+ WHIRR-518. Change to OpenJDK (Frank Scholten via asavu)
+
BUG FIXES
WHIRR-367. Wrong groupId for zookeeper (Joe Crobak via asavu)
Modified: whirr/trunk/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java (original)
+++ whirr/trunk/services/cassandra/src/main/java/org/apache/whirr/service/cassandra/CassandraClusterActionHandler.java Mon Feb 20 11:33:58 2012
@@ -60,7 +60,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/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java (original)
+++ whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchHandler.java Mon Feb 20 11:33:58 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/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java (original)
+++ whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java (original)
+++ whirr/trunk/services/hama/src/main/java/org/apache/whirr/service/hama/HamaClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java (original)
+++ whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java (original)
+++ whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java (original)
+++ whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java (original)
+++ whirr/trunk/services/voldemort/src/main/java/org/apache/whirr/service/voldemort/VoldemortClusterActionHandler.java Mon Feb 20 11:33:58 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/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1291210&r1=1291209&r2=1291210&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Mon Feb 20 11:33:58 2012
@@ -61,7 +61,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"));