whirr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r985032 - in /incubator/whirr/trunk: ./ core/src/main/java/org/apache/whirr/service/ services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/ services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/...
Date Thu, 12 Aug 2010 23:04:20 GMT
Author: tomwhite
Date: Thu Aug 12 23:04:20 2010
New Revision: 985032

URL: http://svn.apache.org/viewvc?rev=985032&view=rev
Log:
WHIRR-58. Introduce naming consistency for cloud service providers. Contributed by Adrian
Cole.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
    incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeServiceBuilder.java
    incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
    incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
    incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Thu Aug 12 23:04:20 2010
@@ -41,6 +41,9 @@ Trunk (unreleased changes)
 
     WHIRR-64. Unify ClusterSpec and ServiceSpec. (tomwhite)
 
+    WHIRR-58. Introduce naming consistency for cloud service providers.
+    (Adrian Cole via tomwhite)
+
   BUG FIXES
 
     WHIRR-50. Cassandra POM should depend on top-level. (tomwhite)

Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java Thu
Aug 12 23:04:20 2010
@@ -70,8 +70,8 @@ public class ClusterSpec {
 
   private String serviceName;
   private String provider;
-  private String account;
-  private String key;
+  private String identity;
+  private String credential;
   private String clusterName;
   private String secretKeyFile;
   
@@ -117,11 +117,11 @@ public class ClusterSpec {
   public String getProvider() {
     return provider;
   }
-  public String getAccount() {
-    return account;
+  public String getIdentity() {
+    return identity;
   }
-  public String getKey() {
-    return key;
+  public String getCredential() {
+    return credential;
   }
   public String getClusterName() {
     return clusterName;
@@ -136,11 +136,11 @@ public class ClusterSpec {
   public void setProvider(String provider) {
     this.provider = provider;
   }
-  public void setAccount(String account) {
-    this.account = account;
+  public void setIdentity(String identity) {
+    this.identity = identity;
   }
-  public void setKey(String key) {
-    this.key = key;
+  public void setCredential(String credential) {
+    this.credential = credential;
   }
   public void setClusterName(String clusterName) {
     this.clusterName = clusterName;

Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeServiceBuilder.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeServiceBuilder.java?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeServiceBuilder.java
(original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeServiceBuilder.java
Thu Aug 12 23:04:20 2010
@@ -40,7 +40,7 @@ public class ComputeServiceBuilder {
       new Log4JLoggingModule());
 
     ComputeServiceContext context = new ComputeServiceContextFactory()
-      .createContext(spec.getProvider(), spec.getAccount(), spec.getKey(),
+      .createContext(spec.getProvider(), spec.getIdentity(), spec.getCredential(),
         wiring);
 
     return context.getComputeService();

Modified: incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
(original)
+++ incubator/whirr/trunk/services/cassandra/src/test/java/org/apache/whirr/service/cassandra/integration/CassandraServiceTest.java
Thu Aug 12 23:04:20 2010
@@ -61,8 +61,8 @@ public class CassandraServiceTest {
         CassandraService.CASSANDRA_ROLE));
     clusterSpec.setProvider(checkNotNull(System.getProperty(
         "whirr.test.provider", "ec2")));
-    clusterSpec.setAccount(checkNotNull(System.getProperty("whirr.test.user"), "whirr.test.user"));
-    clusterSpec.setKey(checkNotNull(System.getProperty("whirr.test.key"), "whirr.test.key"));
+    clusterSpec.setIdentity(checkNotNull(System.getProperty("whirr.test.identity"), "whirr.test.identity"));
+    clusterSpec.setCredential(checkNotNull(System.getProperty("whirr.test.credential"), "whirr.test.credential"));
     clusterSpec.setSecretKeyFile(secretKeyFile);
     clusterSpec.setClusterName(clusterName);
     service = new CassandraService();

Modified: incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
(original)
+++ incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/integration/HadoopServiceTest.java
Thu Aug 12 23:04:20 2010
@@ -73,8 +73,8 @@ public class HadoopServiceTest {
         new InstanceTemplate(1, HadoopService.MASTER_ROLE),
         new InstanceTemplate(1, HadoopService.WORKER_ROLE));
     clusterSpec.setProvider(checkNotNull(System.getProperty("whirr.test.provider", "ec2")));
-    clusterSpec.setAccount(checkNotNull(System.getProperty("whirr.test.user")));
-    clusterSpec.setKey(checkNotNull(System.getProperty("whirr.test.key")));
+    clusterSpec.setIdentity(checkNotNull(System.getProperty("whirr.test.identity")));
+    clusterSpec.setCredential(checkNotNull(System.getProperty("whirr.test.credential")));
     clusterSpec.setSecretKeyFile(secretKeyFile);
     clusterSpec.setClusterName(clusterName);
     service = new HadoopService();

Modified: incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java?rev=985032&r1=985031&r2=985032&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java
(original)
+++ incubator/whirr/trunk/services/zookeeper/src/test/java/org/apache/whirr/service/zookeeper/integration/ZooKeeperServiceTest.java
Thu Aug 12 23:04:20 2010
@@ -57,8 +57,8 @@ public class ZooKeeperServiceTest {
     clusterSpec = new ClusterSpec(
         new InstanceTemplate(2, ZooKeeperService.ZOOKEEPER_ROLE));
     clusterSpec.setProvider(checkNotNull(System.getProperty("whirr.test.provider", "ec2")));
-    clusterSpec.setAccount(checkNotNull(System.getProperty("whirr.test.user")));
-    clusterSpec.setKey(checkNotNull(System.getProperty("whirr.test.key")));
+    clusterSpec.setIdentity(checkNotNull(System.getProperty("whirr.test.identity")));
+    clusterSpec.setCredential(checkNotNull(System.getProperty("whirr.test.credential")));
     clusterSpec.setSecretKeyFile(secretKeyFile);
     clusterSpec.setClusterName(clusterName);
     service = new ZooKeeperService();



Mime
View raw message