From 253ddc40aa68e067c1039c0929003080a7421f91 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 5 Jun 2018 14:09:21 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- ...lti__spring_cloud_context_application_context_services.html | 3 +-- single/spring-cloud-commons.html | 3 +-- spring-cloud-commons.xml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/multi/multi__spring_cloud_context_application_context_services.html b/multi/multi__spring_cloud_context_application_context_services.html index 733331e4..b3992730 100644 --- a/multi/multi__spring_cloud_context_application_context_services.html +++ b/multi/multi__spring_cloud_context_application_context_services.html @@ -2,8 +2,7 @@ 1. Spring Cloud Context: Application Context Services
1. Spring Cloud Context: Application Context Services
Prev   Next

1. Spring Cloud Context: Application Context Services

Spring Boot has an opinionated view of how to build an application with Spring. For instance, it has conventional locations for common configuration files and has endpoints for common management and monitoring tasks. -Spring Cloud builds on top of that and adds a few features that probably all components in a system would use or occasionally need.

1.1 The Bootstrap Application Context

<<<<<<< HEAD -A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. +Spring Cloud builds on top of that and adds a few features that probably all components in a system would use or occasionally need.

1.1 The Bootstrap Application Context

A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. It is responsible for loading configuration properties from the external sources and for decrypting properties in the local external configuration files. The two contexts share an Environment, which is the source of external properties for any Spring application. By default, bootstrap properties (not bootstrap.properties but properties that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration.

The bootstrap context uses a different convention for locating external configuration than the main application context. diff --git a/single/spring-cloud-commons.html b/single/spring-cloud-commons.html index 97d3f281..0c27b32f 100644 --- a/single/spring-cloud-commons.html +++ b/single/spring-cloud-commons.html @@ -8,8 +8,7 @@ Spring Cloud Context provides utilities and special services for the

Extract the files into the JDK/jre/lib/security folder for whichever version of JRE/JDK x64/x86 you use.

[Note]Note

Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, you can find the source code and issue trackers for the project at github.

1. Spring Cloud Context: Application Context Services

Spring Boot has an opinionated view of how to build an application with Spring. For instance, it has conventional locations for common configuration files and has endpoints for common management and monitoring tasks. -Spring Cloud builds on top of that and adds a few features that probably all components in a system would use or occasionally need.

1.1 The Bootstrap Application Context

<<<<<<< HEAD -A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. +Spring Cloud builds on top of that and adds a few features that probably all components in a system would use or occasionally need.

1.1 The Bootstrap Application Context

A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. It is responsible for loading configuration properties from the external sources and for decrypting properties in the local external configuration files. The two contexts share an Environment, which is the source of external properties for any Spring application. By default, bootstrap properties (not bootstrap.properties but properties that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration.

The bootstrap context uses a different convention for locating external configuration than the main application context. diff --git a/spring-cloud-commons.xml b/spring-cloud-commons.xml index 4bf636d6..e3d24479 100644 --- a/spring-cloud-commons.xml +++ b/spring-cloud-commons.xml @@ -40,8 +40,7 @@ For instance, it has conventional locations for common configuration files and h Spring Cloud builds on top of that and adds a few features that probably all components in a system would use or occasionally need.

The Bootstrap Application Context -<<<<<<< HEAD -A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. +A Spring Cloud application operates by creating a “bootstrap” context, which is a parent context for the main application. It is responsible for loading configuration properties from the external sources and for decrypting properties in the local external configuration files. The two contexts share an Environment, which is the source of external properties for any Spring application. By default, bootstrap properties (not bootstrap.properties but properties that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration.