svn commit: r1335487 - in /whirr/trunk/services/elasticsearch/src: main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java

[asavu]

Author: asavu
Date: Tue May  8 12:48:14 2012
New Revision: 1335487

URL: http://svn.apache.org/viewvc?rev=1335487&view=rev
Log:
WHIRR-554. Fixed install command for AWS plugin (Frank Scholten via asavu)

Modified:
    
whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java
    
whirr/trunk/services/elasticsearch/src/test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java

Modified: 
whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java?rev=1335487&r1=1335486&r2=1335487&view=diff
==============================================================================
--- 
whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java
 (original)
+++ 
whirr/trunk/services/elasticsearch/src/main/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilder.java
 Tue May  8 12:48:14 2012
@@ -94,8 +94,8 @@ public class ElasticSearchConfigurationB
     if (!config.containsKey("es.cloud.aws.secret_key")) {
       config.addProperty("es.cloud.aws.secret_key", spec.getCredential());
     }
-    if (!config.getList("es.plugins", 
Lists.newLinkedList()).contains("cloud-aws")) {
-      config.addProperty("es.plugins", "cloud-aws");
+    if (!config.getList("es.plugins", 
Lists.newLinkedList()).contains("elasticsearch/elasticsearch-cloud-aws/1.5.0")) 
{
+      config.addProperty("es.plugins", 
"elasticsearch/elasticsearch-cloud-aws/1.5.0");
     }
   }
 

Modified: 
whirr/trunk/services/elasticsearch/src/test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java
URL: 
http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java?rev=1335487&r1=1335486&r2=1335487&view=diff
==============================================================================
--- 
whirr/trunk/services/elasticsearch/src/test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java
 (original)
+++ 
whirr/trunk/services/elasticsearch/src/test/java/org/apache/whirr/service/elasticsearch/ElasticSearchConfigurationBuilderTest.java
 Tue May  8 12:48:14 2012
@@ -68,7 +68,7 @@ public class ElasticSearchConfigurationB
     Configuration config = ElasticSearchConfigurationBuilder.buildConfig(spec, 
null);
 
     assertThat(config.getStringArray("es.plugins"),
-      is(new String[]{"lang-javascript", "lang-python", "cloud-aws"}));
+      is(new String[]{"lang-javascript", "lang-python", 
"elasticsearch/elasticsearch-cloud-aws/1.5.0"}));
     assertThat(config.getString("es.discovery.type"), is("ec2"));
   }