From 32e0f61421609cb3328d61e4eee01af24d0aa70f Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 16 Nov 2015 17:53:43 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 spring-cloud.html | 800 ++++------------------------------------------
 1 file changed, 60 insertions(+), 740 deletions(-)

diff --git a/spring-cloud.html b/spring-cloud.html
index 84db7f3..500ae6c 100644
--- a/spring-cloud.html
+++ b/spring-cloud.html
@@ -455,11 +455,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_key_management">Key Management</a></li>
 <li><a href="#_creating_a_key_store_for_testing">Creating a Key Store for Testing</a></li>
 <li><a href="#_using_multiple_keys_and_key_rotation">Using Multiple Keys and Key Rotation</a></li>
+<li><a href="#_embedding_the_config_server">Embedding the Config Server</a></li>
 </ul>
 </li>
-<li><a href="#_serving_plain_text">Serving Plain Text</a></li>
-<li><a href="#_embedding_the_config_server">Embedding the Config Server</a></li>
-<li><a href="#_push_notifications_and_spring_cloud_bus">Push Notifications and Spring Cloud Bus</a></li>
 <li><a href="#_spring_cloud_config_client">Spring Cloud Config Client</a>
 <ul class="sectlevel2">
 <li><a href="#config-first-bootstrap">Config First Bootstrap</a></li>
@@ -478,11 +476,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <ul class="sectlevel2">
 <li><a href="#_registering_with_eureka">Registering with Eureka</a></li>
 <li><a href="#_status_page_and_health_indicator">Status Page and Health Indicator</a></li>
-<li><a href="#_registering_a_secure_application">Registering a Secure Application</a></li>
-<li><a href="#_eureka_s_health_checks">Eureka&#8217;s Health Checks</a></li>
 <li><a href="#_eureka_metadata_for_instances_and_clients">Eureka Metadata for Instances and Clients</a></li>
-<li><a href="#_using_the_eurekaclient">Using the EurekaClient</a></li>
-<li><a href="#_alternatives_to_the_native_netflix_eurekaclient">Alternatives to the native Netflix EurekaClient</a></li>
+<li><a href="#_using_the_discoveryclient">Using the DiscoveryClient</a></li>
+<li><a href="#_alternatives_to_the_native_netflix_discoveryclient">Alternatives to the native Netflix DiscoveryClient</a></li>
 <li><a href="#_why_is_it_so_slow_to_register_a_service">Why is it so Slow to Register a Service?</a></li>
 </ul>
 </li>
@@ -517,19 +513,11 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <li><a href="#_using_the_ribbon_api_directly">Using the Ribbon API Directly</a></li>
 </ul>
 </li>
-<li><a href="#spring-cloud-feign">Declarative REST Client: Feign</a>
-<ul class="sectlevel2">
-<li><a href="#spring-cloud-feign-overriding-defaults">Overriding Feign Defaults</a></li>
-<li><a href="#spring-cloud-feign-inheritance">Feign Inheritance Support</a></li>
-<li><a href="#_feign_request_response_compression">Feign request/response compression</a></li>
-<li><a href="#_feign_logging">Feign logging</a></li>
-</ul>
-</li>
+<li><a href="#spring-cloud-feign">Declarative REST Client: Feign</a></li>
 <li><a href="#_external_configuration_archaius">External Configuration: Archaius</a></li>
 <li><a href="#_router_and_filter_zuul">Router and Filter: Zuul</a>
 <ul class="sectlevel2">
 <li><a href="#netflix-zuul-reverse-proxy">Embedded Zuul Reverse Proxy</a></li>
-<li><a href="#_strangulation_patterns_and_local_forwards">Strangulation Patterns and Local Forwards</a></li>
 <li><a href="#_uploading_files_through_zuul">Uploading Files through Zuul</a></li>
 <li><a href="#_plain_embedded_zuul">Plain Embedded Zuul</a></li>
 <li><a href="#_disable_zuul_filters">Disable Zuul Filters</a></li>
@@ -766,8 +754,8 @@ things with their parent.</p>
 <div class="sect2">
 <h3 id="customizing-bootstrap-properties">Changing the Location of Bootstrap Properties</h3>
 <div class="paragraph">
-<p>The <code>bootstrap.yml</code> (or <code>.properties</code>) location can be specified using
-<code>spring.cloud.bootstrap.name</code> (default "bootstrap") or
+<p>The <code>bootstrap.yml</code> (or <code>.properties) location can be specified using
+`spring.cloud.bootstrap.name</code> (default "bootstrap") or
 <code>spring.cloud.bootstrap.location</code> (default empty), e.g. in System
 properties. Those properties behave like the <code>spring.config.*</code>
 variants with the same name, in fact they are used to set up the
@@ -1069,7 +1057,12 @@ the provided `@LoadBalanced</code> <code>Qualifier</code>:</p>
 <h1 id="_spring_cloud_config" class="sect0">Spring Cloud Config</h1>
 <div class="openblock partintro">
 <div class="content">
-Spring Cloud Config provides server and client-side support for externalized configuration in a distributed system. With the Config Server you have a central place to manage external properties for applications across all environments. The concepts on both client and server map identically to the Spring <code>Environment</code> and <code>PropertySource</code> abstractions, so they fit very well with Spring applications, but can be used with any application running in any language. As an application moves through the deployment pipeline from dev to test and into production you can manage the configuration between those environments and be certain that applications have everything they need to run when they migrate. The default implementation of the server storage backend uses git so it easily supports labelled versions of configuration environments, as well as being accessible to a wide range of tooling for managing the content.  It is easy to add alternative implementations and plug them in with Spring configuration.
+<div class="paragraph">
+<p>Spring Cloud Config provides server and client-side support for externalized configuration in a distributed system. With the Config Server you have a central place to manage external properties for applications across all environments. The concepts on both client and server map identically to the Spring <code>Environment</code> and <code>PropertySource</code> abstractions, so they fit very well with Spring applications, but can be used with any application running in any language. As an application moves through the deployment pipeline from dev to test and into production you can manage the configuration between those environments and be certain that applications have everything they need to run when they migrate. The default implementation of the server storage backend uses git so it easily supports labelled versions of configuration environments, as well as being accessible to a wide range of tooling for managing the content.  It is easy to add alternative implementations and plug them in with Spring configuration.</p>
+</div>
+<div class="paragraph">
+<p><a href="https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc" class="bare">https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing-docs.adoc</a></p>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -1085,9 +1078,9 @@ $ mvn spring-boot:run</pre>
 </div>
 </div>
 <div class="paragraph">
-<p>The server is a Spring Boot application so you can run it from your
-IDE instead if you prefer (the main class is
-<code>ConfigServerApplication</code>). Then try it out a client:</p>
+<p>The server is a Spring Boot application so you can build the jar file
+and run that (<code>java -jar &#8230;&#8203;</code>) or pull it down from a Maven
+repository. Then try it out as a client:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1279,78 +1272,7 @@ the config server URL.
 <p>The Server provides an HTTP, resource-based API for external
 configuration (name-value pairs, or equivalent YAML content).  The
 server is easily embeddable in a Spring Boot application using the
-<code>@EnableConfigServer</code> annotation. So this app is a config server:</p>
-</div>
-<div class="listingblock">
-<div class="title">ConfigServer.java</div>
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">@SpringBootApplication
-@EnableConfigServer
-public class ConfigServer {
-  public static void main(String[] args) {
-    SpringApplication.run(ConfigServer.class, args);
-  }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Like all Spring Boot apps it runs on port 8080 by default, but you
-can switch it to the conventional port 8888 in various ways. The
-easiest, which also sets a default configuration repository,
-is by launching it with <code>spring.config.name=configserver</code> (there
-is a <code>configserver.yml</code> in the Config Server jar). Another is
-to use your own <code>application.properties</code>, e.g.</p>
-</div>
-<div class="listingblock">
-<div class="title">application.properties</div>
-<div class="content">
-<pre class="highlight"><code class="language-properties" data-lang="properties">server.port: 8888
-spring.cloud.config.server.git.uri: file://${user.home}/config-repo</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>${user.home}/config-repo</code> is a git repository containing
-YAML and properties files.</p>
-</div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Tip</div>
-</td>
-<td class="content">
-<div class="paragraph">
-<p>Here&#8217;s a recipe for creating the git repository in the example
-above:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>$ cd $HOME
-$ mkdir config-repo
-$ cd config-repo
-$ git init .
-$ echo info.foo: bar &gt; application.properties
-$ git add -A .
-$ git commit -m "Add application.properties"</pre>
-</div>
-</div>
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Warning</div>
-</td>
-<td class="content">
-using the local filesystem for your git repository is
-intended for testing only. Use a server to host your
-configuration repositories in production.
-</td>
-</tr>
-</table>
+<code>@EnableConfigServer</code> annotation.</p>
 </div>
 <div class="sect2">
 <h3 id="_environment_repository">Environment Repository</h3>
@@ -1444,10 +1366,7 @@ them from the shell with quotes '').</p>
 </div>
 <div class="paragraph">
 <p>Spring Cloud Config Server supports a single or multiple git
-repositories with pattern matching on the application and profile
-name. The pattern format is a comma-separated list of
-<code>{application}/{profile}</code> names with wildcards (where a pattern
-beginning with a wildcard may need to be quoted). Example:</p>
+repositories:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -1460,7 +1379,7 @@ beginning with a wildcard may need to be quoted). Example:</p>
           repos:
             simple: https://github.com/simple/config-repo
             special:
-              pattern: special*/dev*,*special*/dev*
+              pattern: pattern*,*pattern1*
               uri: https://github.com/special/config-repo
             local:
               pattern: local*
@@ -1468,14 +1387,12 @@ beginning with a wildcard may need to be quoted). Example:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>If <code>{application}/{profile}</code> does not match any of the patterns, it
-will use the default uri defined under
-"spring.cloud.config.server.git.uri". In the above example, for the
-"simple" repository, the pattern is <code>simple/*</code> (i.e. it only matches
-one application named "simple" in all profiles). The "local"
-repository matches all application names beginning with "local" in all
-profiles (the <code>/*</code> suffix is added automatically to any pattern that
-doesn&#8217;t have a profile matcher).</p>
+<p>In the above example, if <code>{application}</code> does not match any of the
+patterns, it will use the default uri defined under
+"spring.cloud.config.server.git.uri". For the "simple" repository, the
+pattern is "simple" (i.e. it only matches one application named "simple").
+The pattern format is a comma-separated list of application names with
+wildcards (a pattern beginning with a wildcard may need to be quoted).</p>
 </div>
 <div class="admonitionblock note">
 <table>
@@ -1493,50 +1410,6 @@ form.
 </table>
 </div>
 <div class="paragraph">
-<p>The <code>pattern</code> property in the repo is actually an array, so you can
-use a YAML array (or <code>[0]</code>, <code>[1]</code>, etc. suffixes in properties files)
-to bind to multiple patterns. You may need to do this if you are going
-to run apps with multiple profiles. Example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>spring:
-  cloud:
-    config:
-      server:
-        git:
-          uri: https://github.com/spring-cloud-samples/config-repo
-          repos:
-            development:
-              pattern:
-                - */development
-                - */staging
-              uri: https://github.com/development/config-repo
-            staging:
-              pattern:
-                - */qa
-                - */production
-              uri: https://github.com/staging/config-repo</pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-Spring Cloud will guess that a pattern containing a profile that
-doesn&#8217;t end in <code>*</code> implies that you actually want to match a list of
-profiles starting with this pattern (so <code>*/staging</code> is a shortcut for
-<code>["*/staging", "*/staging,*"]</code>). This is common where you need to run
-apps in the "development" profile locally but also the "cloud" profile
-remotely, for instance.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
 <p>Every repository can also optionally store config files in
 sub-directories, and patterns to search for those directories can be
 specified as <code>searchPaths</code>. For example at the top level:</p>
@@ -1755,16 +1628,6 @@ instance:</p>
 </div>
 </div>
 <div class="paragraph">
-<p>Encrypted values in a .properties file must not be wrapped in quotes, otherwise the value will not be decrypted:</p>
-</div>
-<div class="listingblock">
-<div class="title">application.properties</div>
-<div class="content">
-<pre>spring.datasource.username: dbuser
-spring.datasource.password: {cipher}FKSAJDFGYOS8F7GLHAKERGFHLSAJ</pre>
-</div>
-</div>
-<div class="paragraph">
 <p>You can safely push this plain text to a shared git repository and the
 secret password is protected.</p>
 </div>
@@ -1790,25 +1653,10 @@ configured with a symmetric key or a full key pair):</p>
 mysecret</pre>
 </div>
 </div>
-<div class="admonitionblock tip">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Tip</div>
-</td>
-<td class="content">
-If you are testing like this with curl, then use
-<code>--data-urlencode</code> (instead of <code>-d</code>) or set an explicit <code>Content-Type:
-text/plain</code> to make sure curl encodes the data correctly when there
-are special characters ('+' is particularly tricky).
-</td>
-</tr>
-</table>
-</div>
 <div class="paragraph">
-<p>Take the encrypted value and add the <code>{cipher}</code> prefix before you put
+<p>Take the encypted value and add the <code>{cipher}</code> prefix before you put
 it in the YAML or properties file, and before you commit and push it
-to a remote, potentially insecure store. The <code>/encrypt</code> and <code>/decrypt</code>
+to a remote, potentially insecure store. The <code>/encypt</code> and <code>/decrypt</code>
 endpoints also both accept paths of the form <code>/*/{name}/{profiles}</code>
 which can be used to control cryptography per application (name)
 and profile when clients call into the main Environment resource.</p>
@@ -1841,7 +1689,7 @@ mysecret</pre>
 </div>
 </div>
 <div class="paragraph">
-<p>To use a key in a file (e.g. an RSA public key for encryption) prepend
+<p>To use a key in a file (e.g. an RSA public key for encyption) prepend
 the key value with "@" and provide the file path, e.g.</p>
 </div>
 <div class="listingblock">
@@ -1977,108 +1825,8 @@ handle all encryption as well as decryption.
 </table>
 </div>
 </div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_serving_plain_text">Serving Plain Text</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Instead of using the <code>Environment</code> abstraction (or one of the
-alternative representations of it in YAML or properties format) your
-applications might need generic plain text configuration files,
-tailored to their environment. The Config Server provides these
-through an additional endpoint at <code>/{name}/{profile}/{label}/{path}</code>
-where "name", "profile" and "label" have the same meaning as the
-regular environment endpoint, but "path" is a file name
-(e.g. <code>log.xml</code>). The source files for this endpoint are located in
-the same way as for the environment endpoints: the same search path is
-used as for properties or YAML files, but instead of aggregating all
-matching resources, only the first one to match is returned.</p>
-</div>
-<div class="paragraph">
-<p>After a resource is located, placeholders in the normal format
-(<code>${&#8230;&#8203;}</code>) are resolved using the effective <code>Environment</code> for the
-application name, profile and label supplied. In this way the resource
-endpoint is tightly integrated with the environment
-endpoints. Example, if you have this layout for a GIT (or SVN)
-repository:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>application.yml
-nginx.conf</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>where <code>nginx.conf</code> looks like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>server {
-    listen              80;
-    server_name         ${nginx.server.name};
-}</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and <code>application.yml</code> like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">nginx:
-  server:
-    name: example.com
----
-spring:
-  profiles: development
-nginx:
-  server:
-    name: develop.com</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>then the <code>/foo/default/master/nginx.conf</code> resource looks like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>server {
-    listen              80;
-    server_name         example.com;
-}</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>and <code>/foo/development/master/nginx.conf</code> like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>server {
-    listen              80;
-    server_name         develop.com;
-}</pre>
-</div>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-just like the source files for environment configuration, the
-"profile" is used to resolve the file name, so if you want a
-profile-specific file then <code>/*/development/*/logback.xml</code> will be
-resolved by a file called <code>logback-development.xml</code> (in preference
-to <code>logback.xml</code>).
-</td>
-</tr>
-</table>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_embedding_the_config_server">Embedding the Config Server</h2>
-<div class="sectionbody">
+<div class="sect2">
+<h3 id="_embedding_the_config_server">Embedding the Config Server</h3>
 <div class="paragraph">
 <p>The Config Server runs best as a standalone application, but if you
 need to you can embed it in another application. Just use the
@@ -2096,70 +1844,6 @@ initialize the same way as any other application.</p>
 </div>
 </div>
 </div>
-<div class="sect1">
-<h2 id="_push_notifications_and_spring_cloud_bus">Push Notifications and Spring Cloud Bus</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>Many source code repository providers (like Github, Gitlab or Bitbucket
-for instance) will notify you of changes in a repository through a
-webhook. You can configure the webhook via the provider&#8217;s user
-interface as a URL and a set of events in which you are
-interested. For instance
-<a href="https://developer.github.com/v3/activity/events/types/#pushevent">Github</a>
-will POST to the webhook with a JSON body containing a list of
-commits, and a header "X-Github-Event" equal to "push". If you add a
-dependency on the <code>spring-cloud-config-monitor</code> library and activate
-the Spring Cloud Bus in your Config Server, then a "/monitor" endpoint
-is enabled.</p>
-</div>
-<div class="paragraph">
-<p>When the webhook is activated the Config Server will send a
-<code>RefreshRemoteApplicationEvent</code> targeted at the applications it thinks
-might have changed. The change detection can be strategized, but by
-default it just looks for changes in files that match the application
-name (e.g. "foo.properties" is targeted at the "foo" application, and
-"application.properties" is targeted at all applications). The strategy
-if you want to override the behaviour is <code>PropertyPathNotificationExtractor</code>
-which accepts the request headers and body as parameters and returns a list
-of file paths that changed.</p>
-</div>
-<div class="paragraph">
-<p>The default configuration works out of the box with Github, Gitlab or
-Bitbucket. In addition to the JSON notifications from Github, Gitlab
-or Bitbucket you can trigger a change notification by POSTing to
-"/monitor" with a form-encoded body parameters <code>path={name}</code>. This will
-broadcast to applications matching the "{name}" pattern (can contain
-wildcards).</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-the <code>RefreshRemoteApplicationEvent</code> will only be transmitted if
-the <code>spring-cloud-bus</code> is activated in the Config Server and in the
-client application.
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-the default configuration also detects filesystem changes in
-local git repositories (the webhook is not used in that case but as
-soon as you edit a config file a refresh will be broadcast).
-</td>
-</tr>
-</table>
-</div>
-</div>
 </div>
 <div class="sect1">
 <h2 id="_spring_cloud_config_client">Spring Cloud Config Client</h2>
@@ -2437,77 +2121,17 @@ non-default context path or servlet path
 <div class="content">
 <pre>eureka:
   instance:
-    statusPageUrlPath: ${management.context-path}/info
-    healthCheckUrlPath: ${management.context-path}/health</pre>
+    statusPageUrlPath: ${management.contextPath}/info
+    healthCheckUrlPath: ${management.contextPath}/health</pre>
 </div>
 </div>
 <div class="paragraph">
-<p>These links show up in the metadata that is consumed by clients, and
+<p>These links show up in the metadata that is consumers by clients, and
 used in some scenarios to decide whether to send requests to your
 application, so it&#8217;s helpful if they are accurate.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_registering_a_secure_application">Registering a Secure Application</h3>
-<div class="paragraph">
-<p>If your app wants to be contacted over HTTPS you can set two flags in
-the <code>EurekaInstanceConfig</code>, <em>viz</em>
-<code>eureka.instance.[nonSecurePortEnabled,securePortEnabled]=[false,true]</code>
-respectively. This will make Eureka publish instance information
-showing an explicit preference for secure communication. The Spring
-Cloud <code>DiscoveryClient</code> will always return an <code><a href="https://&#8230;&#8203" class="bare">https://&#8230;&#8203</a>;</code> URI for a
-service configured this way, and the Eureka (native) instance
-information will have a secure health check URL. Because of the way
-Eureka works internally, it will still publish a non-secure URL for
-status and home page unless you also override those explicitly.</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-If your app is running behind a proxy, and the SSL termination
-is in the proxy (e.g. if you run in Cloud Foundry or other platforms
-as a service) then you will need to ensure that the proxy "forwarded"
-headers are intercepted and handled by the application. An embedded
-Tomcat container in a Spring Boot app does this automatically if it
-has explicit configuration for the 'X-Forwarded-\*` headers. A sign
-that you got this wrong will be that the links rendered by your app to
-itself will be wrong (the wrong host, port or protocol).
-</td>
-</tr>
-</table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_eureka_s_health_checks">Eureka&#8217;s Health Checks</h3>
-<div class="paragraph">
-<p>By default, Eureka uses the client heartbeat to determine if a client is up.
-Unless specified otherwise the Discovery Client will not propagate the
-current health check status of the application per the Spring Boot Actuator.  Which means
-that after successful registration Eureka will always announce that the
-application is in 'UP' state. This behaviour can be altered by enabling
-Eureka health checks, which results in propagating application status
-to Eureka. As a consequence every other application won&#8217;t be sending
-traffic to application in state other then 'UP'.</p>
-</div>
-<div class="listingblock">
-<div class="title">application.yml</div>
-<div class="content">
-<pre>eureka:
-  client:
-    healthcheck:
-      enabled: true</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>If you require more control over the health checks, you may consider
-implementing your own <code>com.netflix.appinfo.HealthCheckHandler</code>.</p>
-</div>
-</div>
-<div class="sect2">
 <h3 id="_eureka_metadata_for_instances_and_clients">Eureka Metadata for Instances and Clients</h3>
 <div class="paragraph">
 <p>It&#8217;s worth spending a bit of time understanding how the Eureka metadata works, so you can use it in a way that makes sense in your platform. There is standard metadata for things like hostname, IP address, port numbers, status page and health check. These are published in the service registry and used by clients to contact the services in a straightforward way. Additional metadata can be added to the instance registration in the <code>eureka.instance.metadataMap</code>, and this will be accessible in the remote clients, but in general will not change the behaviour of the client, unless it is made aware of the meaning of the metadata. There are a couple of special cases described below where Spring Cloud already assigns meaning to the metadata map.</p>
@@ -2515,7 +2139,7 @@ implementing your own <code>com.netflix.appinfo.HealthCheckHandler</code>.</p>
 <div class="sect3">
 <h4 id="_using_eureka_on_cloudfoundry">Using Eureka on Cloudfoundry</h4>
 <div class="paragraph">
-<p>Cloudfoundry has a global router so that all instances of the same app have the same hostname (it&#8217;s the same in other PaaS solutions with a similar architecture). This isn&#8217;t necessarily a barrier to using Eureka, but if you use the router (recommended, or even mandatory depending on the way your platform was set up), you need to explicitly set the hostname and port numbers (secure or non-secure) so that they use the router. You might also want to use instance metadata so you can distinguish between the instances on the client (e.g. in a custom load balancer). By default, the <code>eureka.instance.instanceId</code> is <code>vcap.application.instance_id</code>. For example:</p>
+<p>Cloudfoundry has a global router so that all instances of the same app have the same hostname (it&#8217;s the same in other PaaS solutions with a similar architecture). This isn&#8217;t necessarily a barrier to using Eureka, but if you use the router (recommended, or even mandatory depending on the way your platform was set up), you need to explicitly set the hostname and port numbers (secure or non-secure) so that they use the router. You might also want to use instance metadata so you can distinguish between the instances on the client (e.g. in a custom load balancer). For example:</p>
 </div>
 <div class="listingblock">
 <div class="title">application.yml</div>
@@ -2523,7 +2147,9 @@ implementing your own <code>com.netflix.appinfo.HealthCheckHandler</code>.</p>
 <pre>eureka:
   instance:
     hostname: ${vcap.application.uris[0]}
-    nonSecurePort: 80</pre>
+    nonSecurePort: 80
+    metadataMap:
+      instanceId: ${vcap.application.instance_id:${spring.application.name}:${spring.application.instance_id:${server.port}}}</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2549,19 +2175,17 @@ public EurekaInstanceConfigBean eurekaInstanceConfig() {
 </div>
 </div>
 <div class="sect3">
-<h4 id="_changing_the_eureka_instance_id">Changing the Eureka Instance ID</h4>
+<h4 id="_making_the_eureka_instance_id_unique">Making the Eureka Instance ID Unique</h4>
 <div class="paragraph">
-<p>A vanilla Netflix Eureka instance is registered with an ID that is equal to its host name (i.e. only one service per host). Spring Cloud Eureka provides a sensible default that looks like this: <code>${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${server.port}}}</code>. For example <code>myhost:myappname:8080</code>.</p>
-</div>
-<div class="paragraph">
-<p>Using Spring Cloud you can override this by providing a unique identifier in <code>eureka.instance.instanceId</code>. For example:</p>
+<p>By default a eureka instance is registered with an ID that is equal to its host name (i.e. only one service per host). Using Spring Cloud you can override this by providing a unique identifier in <code>eureka.instance.metadataMap.instanceId</code>. For example:</p>
 </div>
 <div class="listingblock">
 <div class="title">application.yml</div>
 <div class="content">
 <pre>eureka:
   instance:
-    instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}}</pre>
+    metadataMap:
+      instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}}</pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2574,17 +2198,17 @@ random value will not be needed.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_using_the_eurekaclient">Using the EurekaClient</h3>
+<h3 id="_using_the_discoveryclient">Using the DiscoveryClient</h3>
 <div class="paragraph">
-<p>Once you have an app that is <code>@EnableDiscoveryClient</code> (or <code>@EnableEurekaClient</code>) you can use it to
+<p>Once you have an app that is <code>@EnableEurekaClient</code> you can use it to
 discover service instances from the <a href="#spring-cloud-eureka-server">Eureka Server</a>. One way to do that is to use the native
-<code>com.netflix.discovery.EurekaClient</code> (as opposed to the Spring
+<code>com.netflix.discovery.DiscoveryClient</code> (as opposed to the Spring
 Cloud <code>DiscoveryClient</code>), e.g.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre>@Autowired
-private EurekaClient discoveryClient;
+private DiscoveryClient discoveryClient;
 
 public String serviceUrl() {
     InstanceInfo instance = discoveryClient.getNextServerFromEureka("STORES", false);
@@ -2600,7 +2224,7 @@ public String serviceUrl() {
 </td>
 <td class="content">
 <div class="paragraph">
-<p>Don&#8217;t use the <code>EurekaClient</code> in <code>@PostConstruct</code> method or in a
+<p>Don&#8217;t use the <code>DiscoveryClient</code> in <code>@PostConstruct</code> method or in a
 <code>@Scheduled</code> method (or anywhere where the <code>ApplicationContext</code> might
 not be started yet). It is initialized in a <code>SmartLifecycle</code> (with
 <code>phase=0</code>) so the earliest you can rely on it being available is in
@@ -2612,9 +2236,9 @@ another <code>SmartLifecycle</code> with higher phase.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_alternatives_to_the_native_netflix_eurekaclient">Alternatives to the native Netflix EurekaClient</h3>
+<h3 id="_alternatives_to_the_native_netflix_discoveryclient">Alternatives to the native Netflix DiscoveryClient</h3>
 <div class="paragraph">
-<p>You don&#8217;t have to use the raw Netflix <code>EurekaClient</code> and usually it
+<p>You don&#8217;t have to use the raw Netflix <code>DiscoveryClient</code> and usually it
 is more convenient to use it behind a wrapper of some sort. Spring
 Cloud has support for <a href="#spring-cloud-feign">Feign</a> (a REST client
 builder) and also <a href="#spring-cloud-ribbon">Spring <code>RestTemplate</code></a> using
@@ -2917,6 +2541,9 @@ for details on the properties available.</p>
 <div class="paragraph">
 <p>The same thing applies if you are using <code>@SessionScope</code> or <code>@RequestScope</code>. You will know when you need to do this because of a runtime exception that says it can&#8217;t find the scoped context.</p>
 </div>
+<div class="paragraph">
+<p>In particular you might be interested</p>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_health_indicator_2">Health Indicator</h3>
@@ -3131,7 +2758,7 @@ explicitly in the <code>@ComponentScan</code>).
 <p><code>IPing</code> ribbonPing: <code>NoOpPing</code></p>
 </li>
 <li>
-<p><code>ServerList&lt;Server&gt;</code> ribbonServerList: <code>ConfigurationBasedServerList</code></p>
+<p><code>ServerList&lt;Server&gt; ribbonServerList: `ConfigurationBasedServerList</code></p>
 </li>
 <li>
 <p><code>ServerListFilter&lt;Server&gt;</code> ribbonServerListFilter: <code>ZonePreferenceServerListFilter</code></p>
@@ -3176,7 +2803,7 @@ server list will be constructed with "zone" information as provided in
 the instance metadata (so on the client set
 <code>eureka.instance.metadataMap.zone</code>), and if that is missing it can use
 the domain name from the server hostname as a proxy for zone (if the
-flag <code>approximateZoneFromHostname</code> is set). Once the zone information is
+flag <code>approximateZoneFromDomain</code> is set). Once the zone information is
 available it can be used in a <code>ServerListFilter</code> (by default it will
 be used to locate a server in the same zone as the client because the
 default is a <code>ZonePreferenceServerListFilter</code>).</p>
@@ -3273,7 +2900,7 @@ public interface StoreClient {
     List&lt;Store&gt; getStores();
 
     @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
-    Store update(@PathVariable("storeId") Long storeId, Store store);
+    Store update(@PathParameter("storeId") Long storeId, Store store);
 }</code></pre>
 </div>
 </div>
@@ -3292,239 +2919,6 @@ don&#8217;t want to use Eureka, you can simply configure a list of servers
 in your external configuration (see
 <a href="#spring-cloud-ribbon-without-eureka">above for example</a>).</p>
 </div>
-<div class="sect2">
-<h3 id="spring-cloud-feign-overriding-defaults">Overriding Feign Defaults</h3>
-<div class="paragraph">
-<p>A central concept in Spring Cloud&#8217;s Feign support is that of the named client. Each feign client is part of an ensemble of components that work together to contact a remote server on demand, and the ensemble has a name that you give it as an application developer using the <code>@FeignClient</code> annotation. Spring Cloud creates a new ensemble as an
-<code>ApplicationContext</code> on demand for each named client using <code>FeignClientsConfiguration</code>. This contains (amongst other things) an <code>feign.Decoder</code>, a <code>feign.Encoder</code>, and a <code>feign.Contract</code>.</p>
-</div>
-<div class="paragraph">
-<p>Spring Cloud lets you take full control of the feign client by declaring additional configuration (on top of the <code>FeignClientsConfiguration</code>) using <code>@FeignClient</code>. Example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">@FeignClient(name = "stores", configuration = FooConfiguration.class)
-public interface StoreClient {
-    //..
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>In this case the client is composed from the components already in <code>FeignClientsConfiguration</code> together with any in <code>FooConfiguration</code> (where the latter will override the former).</p>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Warning</div>
-</td>
-<td class="content">
-The <code>FooConfiguration</code> has to be <code>@Configuration</code> but take care that it is not in a <code>@ComponentScan</code> for the main application context, otherwise it will be used for every <code>@FeignClient</code>. If you use <code>@ComponentScan</code> (or <code>@SpringBootApplication</code>) you need to take steps to avoid it being included (for instance put it in a separate, non-overlapping package, or specify the packages to scan explicitly in the <code>@ComponentScan</code>).
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-The <code>serviceId</code> attribute is now deprecated in favor of the <code>name</code> attribute.
-</td>
-</tr>
-</table>
-</div>
-<div class="admonitionblock warning">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Warning</div>
-</td>
-<td class="content">
-Previously, using the <code>url</code> attribute, did not require the <code>name</code> attribute. Using <code>name</code> is now required.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
-<p>Spring Cloud Netflix provides the following beans by default for feign (<code>BeanType</code> beanName: <code>ClassName</code>):</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>Decoder</code> feignDecoder: <code>ResponseEntityDecoder</code> (which wraps a <code>SpringDecoder</code>)</p>
-</li>
-<li>
-<p><code>Encoder</code> feignEncoder: <code>SpringEncoder</code></p>
-</li>
-<li>
-<p><code>Logger</code> feignLogger: <code>Slf4jLogger</code></p>
-</li>
-<li>
-<p><code>Contract</code> feignContract: <code>SpringMvcContract</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Spring Cloud Netflix <em>does not</em> provide the following beans by default for feign, but still looks up beans of these types from the application context to create the feign client:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>Logger.Level</code></p>
-</li>
-<li>
-<p><code>Retryer</code></p>
-</li>
-<li>
-<p><code>ErrorDecoder</code></p>
-</li>
-<li>
-<p><code>Request.Options</code></p>
-</li>
-<li>
-<p><code>Collection&lt;RequestInterceptor&gt;</code></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Creating a bean of one of those type and placing it in a <code>@FeignClient</code> configuration (such as <code>FooConfiguration</code> above) allows you to override each one of the beans described.  Example:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">@Configuration
-public class FooConfiguration {
-    @Bean
-    public Contract feignContractg() {
-        return new feign.Contract.Default();
-    }
-
-    @Bean
-    public BasicAuthRequestInterceptor basicAuthRequestInterceptor() {
-        return new BasicAuthRequestInterceptor("user", "password");
-    }
-}</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This replaces the <code>SpringMvcContract</code> with <code>feign.Contract.Default</code> and adds a <code>RequestInterceptor</code> to the collection of <code>RequestInterceptor</code>.</p>
-</div>
-<div class="paragraph">
-<p>Default configurations can be specified in the <code>@EnableFeignClients</code> attribute <code>defaultConfiguration</code> in a similar manner as described above. The difference is that this configuration will apply to <em>all</em> feign clients.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="spring-cloud-feign-inheritance">Feign Inheritance Support</h3>
-<div class="paragraph">
-<p>Feign supports boilerplate apis via single-inheritance interfaces.
-This allows grouping common operations into convenient base interfaces.
-Together with Spring MVC you can share the same contract for your
-REST endpoint and Feign client.</p>
-</div>
-<div class="listingblock">
-<div class="title">UserService.java</div>
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">public interface UserService {
-
-    @RequestMapping(method = RequestMethod.GET, value ="/users/{id}")
-    User getUser(@PathVariable("id") long id);
-}</code></pre>
-</div>
-</div>
-<div class="listingblock">
-<div class="title">UserResource.java</div>
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">@RestController
-public class UserResource implements UserService {
-
-}</code></pre>
-</div>
-</div>
-<div class="listingblock">
-<div class="title">UserClient.java</div>
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">package project.user;
-
-@FeignClient("users")
-public interface UserClient extends UserService {
-
-}</code></pre>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_feign_request_response_compression">Feign request/response compression</h3>
-<div class="paragraph">
-<p>You may consider enabling the request or response GZIP compression for your
-Feign requests. You can do this by enabling one of the properties:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">feign.compression.request.enabled=true
-feign.compression.response.enabled=true</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>Feign request compression gives you settings similar to what you may set for your web server:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">feign.compression.request.enabled=true
-feign.compression.request.mime-types=text/xml,application/xml,application/json
-feign.compression.request.min-request-size=2048</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>These properties allow you to be selective about the compressed media types and minimum request threshold length.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_feign_logging">Feign logging</h3>
-<div class="paragraph">
-<p>A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the <code>DEBUG</code> level.</p>
-</div>
-<div class="listingblock">
-<div class="title">application.yml</div>
-<div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">logging.level.project.user.UserClient: DEBUG</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>The <code>Logger.Level</code> object that you may configure per client, tells Feign how much to log. Choices are:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><code>NONE</code>, No logging (<strong>DEFAULT</strong>).</p>
-</li>
-<li>
-<p><code>BASIC</code>, Log only the request method and URL and the response status code and execution time.</p>
-</li>
-<li>
-<p><code>HEADERS</code>, Log the basic information along with request and response headers.</p>
-</li>
-<li>
-<p><code>FULL</code>, Log the headers, body, and metadata for both requests and responses.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>For example, the following would set the <code>Logger.Level</code> to <code>FULL</code>:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre class="highlight"><code class="language-java" data-lang="java">@Configuration
-public class FooConfiguration {
-    @Bean
-    Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
-    }
-}</code></pre>
-</div>
-</div>
-</div>
 </div>
 </div>
 <div class="sect1">
@@ -3548,7 +2942,7 @@ public class FooConfiguration {
 </div>
 </div>
 <div class="paragraph">
-<p>Archaius has its own set of configuration files and loading priorities.  Spring applications should generally not use Archaius directly, but the need to configure the Netflix tools natively remains.  Spring Cloud has a Spring Environment Bridge so Archaius can read properties from the Spring Environment.  This allows Spring Boot projects to use the normal configuration toolchain, while allowing them to configure the Netflix tools, for the most part, as documented.</p>
+<p>Archaius has its own set of configuration files and loading priorities.  Spring applications should generally not use Archaius directly., but the need to configure the Netflix tools natively remains.  Spring Cloud has a Spring Environment Bridge so Archaius can read properties from the Spring Environment.  This allows Spring Boot projects to use the normal configuration toolchain, while allowing them to configure the Netflix tools, for the most part, as documented.</p>
 </div>
 </div>
 </div>
@@ -3628,7 +3022,7 @@ configured routes map, then it will be unignored. Example:</p>
 <div class="title">application.yml</div>
 <div class="content">
 <pre class="highlight"><code class="language-yaml" data-lang="yaml"> zuul:
-  ignoredServices: '*'
+  ignoredServices: *
   routes:
     users: /myusers/**</code></pre>
 </div>
@@ -3739,7 +3133,7 @@ Set that flag to "true" to have the Ribbon client automatically retry failed req
 the Ribbon client configuration).</p>
 </div>
 <div class="paragraph">
-<p>The <code>X-Forwarded-Host</code> header is added to the forwarded requests by
+<p>The <code>X-Forwarded-Host</code> header added to the forwarded requests by
 default.  To turn it off set <code>zuul.addProxyHeaders = false</code>.  The
 prefix path is stripped by default, and the request to the backend
 picks up a header "X-Forwarded-Prefix" ("/myusers" in the examples
@@ -3750,80 +3144,6 @@ above).</p>
 server if you set a default route ("/"), for example <code>zuul.route.home:
 /</code> would route all traffic (i.e. "/**") to the "home" service.</p>
 </div>
-<div class="paragraph">
-<p>If more fine-grained ignoring is needed, you can specify specific patterns to ignore.
-These patterns are being evaluated at the start of the route location process, which
-means prefixes should be included in the pattern to warrant a match. Ignored patterns
-span all services and supersede any other route specification.</p>
-</div>
-<div class="listingblock">
-<div class="title">application.yml</div>
-<div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml"> zuul:
-  ignoredPatterns: /**/admin/**
-  routes:
-    users: /myusers/**</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>This means that all calls such as "/myusers/101" will be forwarded to "/101" on the "users" service.
-But calls including "/admin/" will not resolve.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_strangulation_patterns_and_local_forwards">Strangulation Patterns and Local Forwards</h3>
-<div class="paragraph">
-<p>A common pattern when migrating an existing application or API is to
-"strangle" old endpoints, slowly replacing them with different
-implementations. The Zuul proxy is a useful tool for this because you
-can use it to handle all traffic from clients of the old endpoints,
-but redirect some of the requests to new ones.</p>
-</div>
-<div class="paragraph">
-<p>Example configuration:</p>
-</div>
-<div class="listingblock">
-<div class="title">application.yml</div>
-<div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml"> zuul:
-  routes:
-    first:
-      path: /first/**
-      url: http://first.example.com
-    second:
-      path: /second/**
-      url: forward:/second
-    third:
-      path: /third/**
-      url: forward:/3rd
-    legacy:
-      path: /**
-      url: http://legacy.example.com</code></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>In this example we are strangling the "legacy" app which is mapped to
-all requests that do not match one of the other patterns. Paths in
-<code>/first/<strong></code> have been extracted into a new service with an external
-URL. And paths in <code>/second/</strong></code> are forwared so they can be handled
-locally, e.g. with a normal Spring <code>@RequestMapping</code>. Paths in
-<code>/third/**</code> are also forwarded, but with a different prefix
-(i.e. <code>/third/foo</code> is forwarded to <code>/3rd/foo</code>).</p>
-</div>
-<div class="admonitionblock note">
-<table>
-<tr>
-<td class="icon">
-<div class="title">Note</div>
-</td>
-<td class="content">
-The ignored pattterns aren&#8217;t completely ignored, they just
-aren&#8217;t handled by the proxy (so they are also effectively forwarded
-locally).
-</td>
-</tr>
-</table>
-</div>
 </div>
 <div class="sect2">
 <h3 id="_uploading_files_through_zuul">Uploading Files through Zuul</h3>
@@ -4116,8 +3436,8 @@ Spring CLI v1.2.3.RELEASE</pre>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="highlight"><code>$ gvm install springboot 1.3.0.M5
-$ gvm use springboot 1.3.0.M5</code></pre>
+<pre class="highlight"><code>$ gvm install springboot 1.2.3.RELEASE
+$ gvm use springboot 1.2.3.RELEASE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4126,7 +3446,7 @@ $ gvm use springboot 1.3.0.M5</code></pre>
 <div class="listingblock">
 <div class="content">
 <pre class="highlight"><code>$ mvn install
-$ spring install org.springframework.cloud:spring-cloud-cli:1.1.0.BUILD-SNAPSHOT</code></pre>
+$ spring install org.springframework.cloud:spring-cloud-cli:1.0.2.RELEASE</code></pre>
 </div>
 </div>
 <div class="admonitionblock important">
@@ -4226,7 +3546,7 @@ AQAjPgt3eFZQXwt8tsHAVv/QHiY5sI2dRcR+...</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-11-11 14:30:51 UTC
+Last updated 2015-11-16 17:52:54 UTC
 </div>
 </div>
 </body>