From a2a815e63b0c7b0d8e97943f87a5eea712a9e3e4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 21 May 2019 14:49:46 +0000 Subject: [PATCH] Sync docs from 2.1.x to gh-pages --- 2.1.x/ghpages.sh | 4 ++-- ...ti__spring_cloud_context_application_context_services.html | 4 +++- 2.1.x/single/spring-cloud-commons.html | 4 +++- 2.1.x/spring-cloud-commons.xml | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/2.1.x/ghpages.sh b/2.1.x/ghpages.sh index 57c5da3a..55e76be1 100644 --- a/2.1.x/ghpages.sh +++ b/2.1.x/ghpages.sh @@ -40,7 +40,7 @@ function check_if_anything_to_sync() { function retrieve_current_branch() { # Code getting the name of the current branch. For master we want to publish as we did until now - # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch + # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch # If there is a branch already passed will reuse it - otherwise will try to find it CURRENT_BRANCH=${BRANCH} if [[ -z "${CURRENT_BRANCH}" ]] ; then @@ -147,7 +147,7 @@ function copy_docs_for_current_version() { COMMIT_CHANGES="yes" else echo -e "Current branch is [${CURRENT_BRANCH}]" - # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin + # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH} echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder" diff --git a/2.1.x/multi/multi__spring_cloud_context_application_context_services.html b/2.1.x/multi/multi__spring_cloud_context_application_context_services.html index 962385fa..46644852 100644 --- a/2.1.x/multi/multi__spring_cloud_context_application_context_services.html +++ b/2.1.x/multi/multi__spring_cloud_context_application_context_services.html @@ -15,7 +15,9 @@ The following listing shows an example:

bootstrap.yml.  cloud: config: uri: ${SPRING_CONFIG_URI:http://localhost:8888}

-

If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml).

You can disable the bootstrap process completely by setting spring.cloud.bootstrap.enabled=false (for example, in system properties).

1.2 Application Context Hierarchies

If you build an application context from SpringApplication or SpringApplicationBuilder, then the Bootstrap context is added as a parent to that context. +

If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml). +In order for the property spring.application.name to be used as the application’s context ID you +must set it in bootstrap.[properties | yml].

You can disable the bootstrap process completely by setting spring.cloud.bootstrap.enabled=false (for example, in system properties).

1.2 Application Context Hierarchies

If you build an application context from SpringApplication or SpringApplicationBuilder, then the Bootstrap context is added as a parent to that context. It is a feature of Spring that child contexts inherit property sources and profiles from their parent, so the “main” application context contains additional property sources, compared to building the same context without Spring Cloud Config. The additional property sources are:

  • “bootstrap”: If any PropertySourceLocators are found in the Bootstrap context and if they have non-empty properties, an optional CompositePropertySource appears with high priority. An example would be properties from the Spring Cloud Config Server. diff --git a/2.1.x/single/spring-cloud-commons.html b/2.1.x/single/spring-cloud-commons.html index da252c9c..ad6f9476 100644 --- a/2.1.x/single/spring-cloud-commons.html +++ b/2.1.x/single/spring-cloud-commons.html @@ -21,7 +21,9 @@ The following listing shows an example:

    bootstrap.yml.  cloud: config: uri: ${SPRING_CONFIG_URI:http://localhost:8888}

    -

    If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml).

    You can disable the bootstrap process completely by setting spring.cloud.bootstrap.enabled=false (for example, in system properties).

1.2 Application Context Hierarchies

If you build an application context from SpringApplication or SpringApplicationBuilder, then the Bootstrap context is added as a parent to that context. +

If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml). +In order for the property spring.application.name to be used as the application’s context ID you +must set it in bootstrap.[properties | yml].

You can disable the bootstrap process completely by setting spring.cloud.bootstrap.enabled=false (for example, in system properties).

1.2 Application Context Hierarchies

If you build an application context from SpringApplication or SpringApplicationBuilder, then the Bootstrap context is added as a parent to that context. It is a feature of Spring that child contexts inherit property sources and profiles from their parent, so the “main” application context contains additional property sources, compared to building the same context without Spring Cloud Config. The additional property sources are:

  • “bootstrap”: If any PropertySourceLocators are found in the Bootstrap context and if they have non-empty properties, an optional CompositePropertySource appears with high priority. An example would be properties from the Spring Cloud Config Server. diff --git a/2.1.x/spring-cloud-commons.xml b/2.1.x/spring-cloud-commons.xml index bdc24cb8..3ae179c5 100644 --- a/2.1.x/spring-cloud-commons.xml +++ b/2.1.x/spring-cloud-commons.xml @@ -59,7 +59,9 @@ The following listing shows an example: uri: ${SPRING_CONFIG_URI:http://localhost:8888} -If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml). +If your application needs any application-specific configuration from the server, it is a good idea to set the spring.application.name (in bootstrap.yml or application.yml). +In order for the property spring.application.name to be used as the application’s context ID you +must set it in bootstrap.[properties | yml]. You can disable the bootstrap process completely by setting spring.cloud.bootstrap.enabled=false (for example, in system properties).