diff --git a/README.adoc b/README.adoc index f506f6d2..c5d87808 100644 --- a/README.adoc +++ b/README.adoc @@ -48,7 +48,7 @@ $ curl localhost:8888/foo/development ---- The default strategy for locating property sources is to clone a git -repository (at "spring.platform.config.server.uri") and use it to +repository (at "spring.cloud.config.server.uri") and use it to initialize a mini `SpringApplication`. The mini-application's `Environment` is used to enumerate property sources and publish them via a JSON endpoint. The service has resources in the form: @@ -181,7 +181,7 @@ The sample has a test case where the config server is also started in the same JVM (with a different port), and the test asserts that an environment property from the git configuration repo is present. To change the location of the config server just set -"spring.platform.config.uri" in "bootstrap.yml" (or via System +"spring.cloud.config.uri" in "bootstrap.yml" (or via System properties etc.). The test case has a `main()` method that runs the server in the same diff --git a/docs/README.adoc b/docs/README.adoc index f506f6d2..c5d87808 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -48,7 +48,7 @@ $ curl localhost:8888/foo/development ---- The default strategy for locating property sources is to clone a git -repository (at "spring.platform.config.server.uri") and use it to +repository (at "spring.cloud.config.server.uri") and use it to initialize a mini `SpringApplication`. The mini-application's `Environment` is used to enumerate property sources and publish them via a JSON endpoint. The service has resources in the form: @@ -181,7 +181,7 @@ The sample has a test case where the config server is also started in the same JVM (with a different port), and the test asserts that an environment property from the git configuration repo is present. To change the location of the config server just set -"spring.platform.config.uri" in "bootstrap.yml" (or via System +"spring.cloud.config.uri" in "bootstrap.yml" (or via System properties etc.). The test case has a `main()` method that runs the server in the same diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 7f6dd11d..9a31c157 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -40,7 +40,7 @@ The sample has a test case where the config server is also started in the same JVM (with a different port), and the test asserts that an environment property from the git configuration repo is present. To change the location of the config server just set -"spring.platform.config.uri" in "bootstrap.yml" (or via System +"spring.cloud.config.uri" in "bootstrap.yml" (or via System properties etc.). The test case has a `main()` method that runs the server in the same diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index e86edb90..cf8dfdc1 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -18,7 +18,7 @@ $ curl localhost:8888/foo/development ---- The default strategy for locating property sources is to clone a git -repository (at "spring.platform.config.server.uri") and use it to +repository (at "spring.cloud.config.server.uri") and use it to initialize a mini `SpringApplication`. The mini-application's `Environment` is used to enumerate property sources and publish them via a JSON endpoint. The service has resources in the form: diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index bd727d93..3f3a6146 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -260,7 +260,7 @@ It is a good idea to set the `spring.application.name` in configuration from the server. You can disable the bootstrap process completely by setting -`spring.platform.bootstrap.enabled=false` (e.g. in System properties). +`spring.cloud.bootstrap.enabled=false` (e.g. in System properties). === Customizing the Bootstrap diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java index a8574e7a..fbdf574e 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/BootstrapApplicationListener.java @@ -60,7 +60,7 @@ public class BootstrapApplicationListener implements @Override public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) { Environment environment = event.getEnvironment(); - if (!environment.getProperty("spring.platform.bootstrap.enabled", Boolean.class, + if (!environment.getProperty("spring.cloud.bootstrap.enabled", Boolean.class, true)) { return; } diff --git a/spring-cloud-config-client/src/test/resources/logback.xml b/spring-cloud-config-client/src/test/resources/logback.xml index 4bb3e01d..ba69e8cd 100644 --- a/spring-cloud-config-client/src/test/resources/logback.xml +++ b/spring-cloud-config-client/src/test/resources/logback.xml @@ -1,6 +1,6 @@ - + diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java index 734c9267..ae2ea416 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java @@ -45,7 +45,7 @@ import org.springframework.util.FileSystemUtils; */ public class JGitEnvironmentRepository implements EnvironmentRepository { - public static final String DEFAULT_URI = "https://github.com/spring-platform-samples/config-repo"; + public static final String DEFAULT_URI = "https://github.com/spring-cloud-samples/config-repo"; private static Log logger = LogFactory.getLog(JGitEnvironmentRepository.class); diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java index 12244955..b8b48a21 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java @@ -77,7 +77,7 @@ public class SpringApplicationEnvironmentRepository implements EnvironmentReposi config = "application," + config; } list.add("--spring.config.name=" + config); - list.add("--spring.platform.bootstrap.enabled=false"); + list.add("--spring.cloud.bootstrap.enabled=false"); if (locations != null) { list.add("--spring.config.location=" + StringUtils.arrayToCommaDelimitedString(locations)); diff --git a/spring-cloud-config-server/src/main/resources/application-test.yml b/spring-cloud-config-server/src/main/resources/application-test.yml index 33971f01..ee202fcd 100644 --- a/spring-cloud-config-server/src/main/resources/application-test.yml +++ b/spring-cloud-config-server/src/main/resources/application-test.yml @@ -1,5 +1,5 @@ spring: - platform: + cloud: config: server: basedir: target/config diff --git a/spring-cloud-config-server/src/main/resources/application.yml b/spring-cloud-config-server/src/main/resources/application.yml index 7c19f761..de081f2e 100644 --- a/spring-cloud-config-server/src/main/resources/application.yml +++ b/spring-cloud-config-server/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: application: name: configserver jmx: - default_domain: platform.config.server + default_domain: cloud.config.server server: port: 8888 management: