From fbf9b0049ce42108cf248ca349a10fa8d503a0e4 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Wed, 15 Jan 2014 16:11:53 +0100
Subject: [PATCH] Update to elasticsearch 1.0.0.RC1

Closes #4.
---
 pom.xml                                                |  8 ++++----
 .../cloud/azure/AzureComputeServiceImpl.java           | 10 +++++-----
 .../discovery/azure/AzureUnicastHostsProvider.java     |  4 ++--
 .../azure/AzureComputeServiceAbstractMock.java         |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index abe885ec354..3a463e8edde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to ElasticSearch under one or more contributor
+<!-- Licensed to Elasticsearch under one or more contributor
 license agreements. See the NOTICE file distributed with this work for additional
 information regarding copyright ownership. ElasticSearch licenses this file to you
 under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -17,9 +17,9 @@ governing permissions and limitations under the License. -->
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-cloud-azure</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0.RC1-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <description>Azure Cloud plugin for ElasticSearch</description>
+    <description>Azure Cloud plugin for Elasticsearch</description>
     <inceptionYear>2013</inceptionYear>
     <licenses>
         <license>
@@ -42,7 +42,7 @@ governing permissions and limitations under the License. -->
     </parent>
 
     <properties>
-        <elasticsearch.version>0.90.10</elasticsearch.version>
+        <elasticsearch.version>1.0.0.RC1-SNAPSHOT</elasticsearch.version>
         <lucene.version>4.6.0</lucene.version>
         <tests.output>onerror</tests.output>
         <tests.jvms>1</tests.jvms>
diff --git a/src/main/java/org/elasticsearch/cloud/azure/AzureComputeServiceImpl.java b/src/main/java/org/elasticsearch/cloud/azure/AzureComputeServiceImpl.java
index de82f875846..60428c35873 100644
--- a/src/main/java/org/elasticsearch/cloud/azure/AzureComputeServiceImpl.java
+++ b/src/main/java/org/elasticsearch/cloud/azure/AzureComputeServiceImpl.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.cloud.azure;
 
-import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
@@ -200,18 +200,18 @@ public class AzureComputeServiceImpl extends AbstractLifecycleComponent<AzureCom
     }
 
     @Override
-    protected void doStart() throws ElasticSearchException {
+    protected void doStart() throws ElasticsearchException {
     }
 
     @Override
-    protected void doStop() throws ElasticSearchException {
+    protected void doStop() throws ElasticsearchException {
     }
 
     @Override
-    protected void doClose() throws ElasticSearchException {
+    protected void doClose() throws ElasticsearchException {
     }
 
-    private void checkProperty(String name, String value) throws ElasticSearchException {
+    private void checkProperty(String name, String value) throws ElasticsearchException {
         if (!Strings.hasText(value)) {
             throw new SettingsException("cloud.azure." + name +" is not set or is incorrect.");
         }
diff --git a/src/main/java/org/elasticsearch/discovery/azure/AzureUnicastHostsProvider.java b/src/main/java/org/elasticsearch/discovery/azure/AzureUnicastHostsProvider.java
index 3fbe5f71957..fd5e87d1c41 100644
--- a/src/main/java/org/elasticsearch/discovery/azure/AzureUnicastHostsProvider.java
+++ b/src/main/java/org/elasticsearch/discovery/azure/AzureUnicastHostsProvider.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.discovery.azure;
 
-import org.elasticsearch.ElasticSearchIllegalArgumentException;
+import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.Version;
 import org.elasticsearch.cloud.azure.AzureComputeService;
 import org.elasticsearch.cloud.azure.Instance;
@@ -135,7 +135,7 @@ public class AzureUnicastHostsProvider extends AbstractComponent implements Unic
 
                 if (networkAddress == null) {
                     // We have a bad parameter here or not enough information from azure
-                    throw new ElasticSearchIllegalArgumentException("can't find any " + host_type.name() + " address");
+                    throw new ElasticsearchIllegalArgumentException("can't find any " + host_type.name() + " address");
                 } else {
                     TransportAddress[] addresses = transportService.addressesFromString(networkAddress);
                     // we only limit to 1 addresses, makes no sense to ping 100 ports
diff --git a/src/test/java/org/elasticsearch/discovery/azure/AzureComputeServiceAbstractMock.java b/src/test/java/org/elasticsearch/discovery/azure/AzureComputeServiceAbstractMock.java
index 37b530ee9ba..295a56c93c7 100644
--- a/src/test/java/org/elasticsearch/discovery/azure/AzureComputeServiceAbstractMock.java
+++ b/src/test/java/org/elasticsearch/discovery/azure/AzureComputeServiceAbstractMock.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.discovery.azure;
 
-import org.elasticsearch.ElasticSearchException;
+import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.cloud.azure.AzureComputeService;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.settings.Settings;
@@ -36,16 +36,16 @@ public abstract class AzureComputeServiceAbstractMock extends AbstractLifecycleC
     }
 
     @Override
-    protected void doStart() throws ElasticSearchException {
+    protected void doStart() throws ElasticsearchException {
         logger.debug("starting Azure Api Mock");
     }
 
     @Override
-    protected void doStop() throws ElasticSearchException {
+    protected void doStop() throws ElasticsearchException {
         logger.debug("stopping Azure Api Mock");
     }
 
     @Override
-    protected void doClose() throws ElasticSearchException {
+    protected void doClose() throws ElasticsearchException {
     }
 }