From 17c016dc9b165a075925302ecdd70c77f8b14242 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 2 Dec 2014 13:00:43 -0700
Subject: [PATCH] updated to use new EnableDiscoveryClient. Updated travis.

---
 .travis.yml                                               | 8 ++++----
 ...ation.java => ConsulDiscoveryClientConfiguration.java} | 2 +-
 .../src/main/resources/META-INF/spring.factories          | 6 +++---
 .../cloud/consul/sample/SampleApplication.java            | 2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/{ConsulDiscoveryAutoConfiguration.java => ConsulDiscoveryClientConfiguration.java} (91%)

diff --git a/.travis.yml b/.travis.yml
index c538a813..ed819423 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ script:
 - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true'
 env:
   global:
-  - GIT_NAME="Dave Syer"
-  - GIT_EMAIL=dsyer@pivotal.io
-  - CI_DEPLOY_USERNAME=buildmaster
-  - secure: aeLXRC5oFSddwnZt1/7G2/OHr7jDbxz0ET7sej3I+eSbe3N5vbzQ6FC08es4l89l54ciXd90I1g2BMw7DTYKOO373FP78XPdAEbifJTU4DGd6fCELmoTtUPhjunBIk7E49hisPbv82892IYYA7qi/hzG548cPyZ1IgiJjq0NCsc=
+  - GIT_NAME="Spencer Gibb"
+  - GIT_EMAIL=sgibb@pivotal.io
+  - CI_DEPLOY_USERNAME=sgibb
+  - secure: MX+bQxI10+lHI1rbX/xPSH+Ybey08YwfUQeiJIc2L7wymY5zFtOB63Hf2Iy9sf4FXmM+nNj/OWtg/ROPZNqjcNHNoqF7L8Kz2g/S2T+bHUI7KvMzcSdqief+Z1ywk8XfcEVAjPjUYS6wo6kPFUQy7SDRPOxFO9II1+zdKv4vI80=
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryAutoConfiguration.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
similarity index 91%
rename from spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryAutoConfiguration.java
rename to spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
index 1e05711a..c9ea8615 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryAutoConfiguration.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfiguration.java
@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
  * @author Spencer Gibb
  */
 @Configuration
-public class ConsulDiscoveryAutoConfiguration {
+public class ConsulDiscoveryClientConfiguration {
     @Bean
     public ConsulLifecycle consulLifecycle() {
         return new ConsulLifecycle();
diff --git a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories
index 3a4ccca9..46c566d9 100644
--- a/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-consul-discovery/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
-# Auto Configuration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.consul.discovery.ConsulDiscoveryAutoConfiguration
+# Discovery Client Configuration
+org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
+org.springframework.cloud.consul.discovery.ConsulDiscoveryClientConfiguration
diff --git a/spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java b/spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java
index a5e3ccc3..9fcd553a 100644
--- a/spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java
+++ b/spring-cloud-consul-sample/src/test/java/org/springframework/cloud/consul/sample/SampleApplication.java
@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.cloud.bus.jackson.SubtypeModule;
 import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.consul.bus.SimpleRemoteEvent;
 import org.springframework.cloud.consul.discovery.ConsulLoadBalancerClient;
 import org.springframework.context.ApplicationListener;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Configuration
 @EnableAutoConfiguration
+@EnableDiscoveryClient
 @RestController
 @Slf4j
 public class SampleApplication implements ApplicationListener<SimpleRemoteEvent> {