Sync docs from master to gh-pages

spring-cloud.html

@@ -499,6 +499,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <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="#_uploading_files_through_zuul">Uploading Files through Zuul</a></li>
 <li><a href="#_plain_embedded_zuul">Plain Embedded Zuul</a></li>
 <li><a href="#_polyglot_support_with_sidecar">Polyglot support with Sidecar</a></li>
 </ul>
@@ -1945,34 +1946,32 @@ springBoot {
 </tr>
 </table>
 </div>
-<div class="admonitionblock note">
+<div class="admonitionblock tip">
 <table>
 <tr>
 <td class="icon">
-<div class="title">Note</div>
+<div class="title">Tip</div>
 </td>
 <td class="content">
 <div class="paragraph">
-<p>The Eureka server is tied to log4j and doesn&#8217;t work with logback,
+<p>Due to Gradle&#8217;s dependency resolution rules and the lack of a parent bom feature, simply depending on spring-cloud-starter-eureka-server can cause failures on application startup. To remedy this the Spring dependency management plugin must be added and the Spring cloud starter parent bom must be imported like so:</p>
-so the dependency configuration
-has to be tweaked compared to a normal Spring Boot app. The
-<code>spring-cloud-starter-eureka-server</code> does this for you, but if you
-add logback transitively through another dependency you will need to
-exclude it manually, e.g. in Maven</p>
 </div>
 <div class="listingblock">
-<div class="title">pom.xml</div>
+<div class="title">build.gradle</div>
 <div class="content">
-<pre class="highlight"><code class="language-xml" data-lang="xml">&lt;dependency&gt;
+<pre class="highlight"><code class="language-java" data-lang="java">buildscript {
-    &lt;groupId&gt;org.springframework.boot&lt;/groupId&gt;
+  dependencies {
-    &lt;artifactId&gt;spring-boot-starter-web&lt;/artifactId&gt;
+    classpath "io.spring.gradle:dependency-management-plugin:0.4.0.RELEASE"
-    &lt;exclusions&gt;
+  }
-        &lt;exclusion&gt;
+}
-            &lt;artifactId&gt;spring-boot-starter-logging&lt;/artifactId&gt;
+
-            &lt;groupId&gt;org.springframework.boot&lt;/groupId&gt;
+apply plugin: "io.spring.dependency-management"
-        &lt;/exclusion&gt;
+
-    &lt;/exclusions&gt;
+dependencyManagement {
-&lt;/dependency&gt;</code></pre>
+  imports {
+    mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:1.0.0.RELEASE'
+  }
+}</code></pre>
 </div>
 </div>
 </td>
@@ -2713,6 +2712,41 @@ server if you set a default route ("/"), for example <code>zuul.route.home:
 </div>
 </div>
 <div class="sect2">
+<h3 id="_uploading_files_through_zuul">Uploading Files through Zuul</h3>
+<div class="paragraph">
+<p>If you <code>@EnableZuulProxy</code> you can use the proxy paths to
+upload files and it should just work as long as the files
+are small. For large files there is an alternative path
+which bypasses the Spring <code>DispatcherServlet</code> (to
+avoid multipart processing) in "/zuul/<strong>". I.e. if
+<code>zuul.routes.customers=/customers/</strong>*</code> then you can
+POST large files to "/zuul/customers/*". The servlet
+path is externalized via <code>zuul.servletPath</code>. Extremely
+large files will also require elevated timeout settings
+if the proxy route takes you through a Ribbon load
+balancer, e.g.</p>
+</div>
+<div class="listingblock">
+<div class="title">application.yml</div>
+<div class="content">
+<pre class="highlight"><code class="language-yaml" data-lang="yaml">hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
+ribbon:
+  ConnectTimeout: 3000
+  ReadTimeout: 60000</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Note that for streaming to work with large files, you need to use chunked encoding in the request (which some browsers
+do not do by default). E.g. on the command line:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>$ curl -v -H "Transfer-Encoding: chunked" \
+    -F "file=@mylarge.iso" localhost:9999/zuul/simple/file</pre>
+</div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="_plain_embedded_zuul">Plain Embedded Zuul</h3>
 <div class="paragraph">
 <p>You can also run a Zuul server without the proxying, or switch on parts of the proxying platform selectively, if you
@@ -3026,16 +3060,17 @@ configuration:</p>
 <div class="listingblock">
 <div class="title">application.yml</div>
 <div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">spring.oauth2:
+<pre class="highlight"><code class="language-yaml" data-lang="yaml">spring:
-  client:
+  oauth2:
-    clientId: bd1c0a783ccdd1c9b9e4
+    client:
-    clientSecret: 1a9030fbca47a5b2c28e92f19050bb77824b5ad1
+      clientId: bd1c0a783ccdd1c9b9e4
-    tokenUri: https://github.com/login/oauth/access_token
+      clientSecret: 1a9030fbca47a5b2c28e92f19050bb77824b5ad1
-    authorizationUri: https://github.com/login/oauth/authorize
+      accessTokenUri: https://github.com/login/oauth/access_token
-    authenticationScheme: form
+      userAuthorizationUri: https://github.com/login/oauth/authorize
-  resource:
+      clientAuthenticationScheme: form
-    userInfoUri: https://api.github.com/user
+    resource:
-    preferTokenInfo: false</code></pre>
+      userInfoUri: https://api.github.com/user
+      preferTokenInfo: false</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3095,10 +3130,11 @@ class Application {
 <div class="listingblock">
 <div class="title">application.yml</div>
 <div class="content">
-<pre class="highlight"><code class="language-yaml" data-lang="yaml">oauth2:
+<pre class="highlight"><code class="language-yaml" data-lang="yaml">spring:
-  resource:
+  oauth2:
-    userInfoUri: https://api.github.com/user
+    resource:
-    preferTokenInfo: false</code></pre>
+      userInfoUri: https://api.github.com/user
+      preferTokenInfo: false</code></pre>
 </div>
 </div>
 </div>
@@ -3492,7 +3528,7 @@ ProxyAuthenticationProperties</a> for full details.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-03-16 16:53:03 UTC
+Last updated 2015-03-17 16:33:22 UTC
 </div>
 </div>
 </body>