From 7870c613b62f4285599758dd511b71787a43d982 Mon Sep 17 00:00:00 2001 From: DOHA Date: Wed, 25 Jan 2017 20:47:33 +0200 Subject: [PATCH] rename server --- ...overy.properties => spring-cloud-rest-server.properties} | 2 +- .../java/org/baeldung/SpringCloudRestConfigApplication.java | 3 +-- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/bootstrap.properties | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) rename spring-cloud/spring-cloud-rest/application-config/{discovery.properties => spring-cloud-rest-server.properties} (84%) diff --git a/spring-cloud/spring-cloud-rest/application-config/discovery.properties b/spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties similarity index 84% rename from spring-cloud/spring-cloud-rest/application-config/discovery.properties rename to spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties index 2f2a56248f..96cacdb5fb 100644 --- a/spring-cloud/spring-cloud-rest/application-config/discovery.properties +++ b/spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties @@ -1,4 +1,4 @@ -spring.application.name=discovery +spring.application.name=spring-cloud-rest-server server.port=8761 #### cloud diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java index 90c6fe3ec9..20e1589d5e 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java @@ -3,11 +3,10 @@ package org.baeldung; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.config.server.EnableConfigServer; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; @SpringBootApplication @EnableConfigServer -@EnableEurekaClient +// @EnableEurekaClient public class SpringCloudRestConfigApplication { public static void main(String[] args) { diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties index 1dd8ca5d13..42fed8d0ba 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties @@ -3,6 +3,6 @@ spring.application.name=config spring.cloud.config.server.git.uri=https://github.com/eugenp/tutorials/tree/master/spring-cloud/spring-cloud-rest/application-config -eureka.client.region = default -eureka.client.registryFetchIntervalSeconds = 5 -eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} +#eureka.client.region = default +#eureka.client.registryFetchIntervalSeconds = 5 +#eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties index ca9d59c9ed..296078017e 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties @@ -1,2 +1,2 @@ -spring.cloud.config.name=discovery +spring.cloud.config.name=spring-cloud-rest-server spring.cloud.config.uri=http://localhost:8081 \ No newline at end of file