diff --git a/README.md b/README.md index b7b0148e..5d191aee 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ $ curl localhost:8888/foo/development ``` The default strategy for locating property sources is to clone a git -repository (at "spring.platform.config.uri") and use it to initialize +repository (at "spring.platform.config.server.uri") and use it to initialize a `SpringApplication`. The application's `Environment` is used to enumerate property sources. The service has resources in the form: @@ -58,7 +58,7 @@ the startup behaviour you can change the location of the server using bootstrap phase of an application context), e.g. ``` -spring.platform.config.url: http://myconfigserver.com +spring.platform.config.uri: http://myconfigserver.com ``` ## Sample Application diff --git a/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java b/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java index a16102a6..0311389e 100644 --- a/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java +++ b/spring-platform-config-client/src/main/java/org/springframework/platform/bootstrap/config/ConfigServiceBootstrapConfiguration.java @@ -61,6 +61,7 @@ public class ConfigServiceBootstrapConfiguration implements if (source == null) { continue; } + logger.info("Located property source: " + source); composite.addPropertySource(source); empty = false; } diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java index 464e5809..222129b7 100644 --- a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java +++ b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/Application.java @@ -54,7 +54,7 @@ public class Application { @Profile("!native") protected static class GitRepositoryConfiguration { @Bean - @ConfigurationProperties("spring.platform.config") + @ConfigurationProperties("spring.platform.config.server") public JGitEnvironmentRepository repository() { return new JGitEnvironmentRepository(); }