7 years ago · de95583509
--- a/docs/manual/src/docs/asciidoc/_includes/preface/guides.adoc
+++ b/docs/manual/src/docs/asciidoc/_includes/preface/guides.adoc
@@ -27,8 +27,8 @@ If you are looking to get started with Spring Security, the best place to start
 
				 | Demonstrates how to create a custom login form.
			
 
				 | link:../../guides/html5/form-javaconfig.html[Custom Login Form Guide]
			
 
				 
			
 
				-| {gh-samples-url}/boot/oauth2login[OAuth 2.0 Login]
			
 
				+| {gh-samples-url}/boot/oauth2/oauth2login[OAuth 2.0 Login]
			
 
				 | Demonstrates how to integrate OAuth 2.0 Login with an OAuth 2.0 or OpenID Connect 1.0 Provider.
			
 
				-| link:{gh-samples-url}/boot/oauth2login/README.adoc[OAuth 2.0 Login Guide]
			
 
				+| link:{gh-samples-url}/boot/oauth2/oauth2login/README.adoc[OAuth 2.0 Login Guide]
			
 
				 
			
 
				 |===
			
--- a/docs/manual/src/docs/asciidoc/_includes/preface/java-configuration.adoc
+++ b/docs/manual/src/docs/asciidoc/_includes/preface/java-configuration.adoc
@@ -466,7 +466,7 @@ NOTE: OAuth 2.0 Login is implemented by using the *Authorization Code Grant*, as
 
				 
			
 
				 Spring Boot 2.0 brings full auto-configuration capabilities for OAuth 2.0 Login.
			
 
				 
			
 
				-This section shows how to configure the {gh-samples-url}/boot/oauth2login[*OAuth 2.0 Login sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
			
 
				+This section shows how to configure the {gh-samples-url}/boot/oauth2/oauth2login[*OAuth 2.0 Login sample*] using _Google_ as the _Authentication Provider_ and covers the following topics:
			
 
				 
			
 
				 * <<jc-oauth2login-sample-initial-setup,Initial setup>>
			
 
				 * <<jc-oauth2login-sample-redirect-uri,Setting the redirect URI>>
			
--- a/samples/boot/oauth2/oauth2login-webflux/README.adoc
+++ b/samples/boot/oauth2/oauth2login-webflux/README.adoc
--- a/samples/boot/oauth2/oauth2login-webflux/spring-security-samples-boot-oauth2-oauth2login-webflux.gradle
+++ b/samples/boot/oauth2/oauth2login-webflux/spring-security-samples-boot-oauth2-oauth2login-webflux.gradle
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/META-INF/spring.factories
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/resources/META-INF/spring.factories
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/application.yml
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/resources/application.yml
--- a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/templates/index.html
+++ b/samples/boot/oauth2/oauth2login-webflux/src/main/resources/templates/index.html
--- a/samples/boot/oauth2/oauth2login/README.adoc
+++ b/samples/boot/oauth2/oauth2login/README.adoc
--- a/samples/boot/oauth2/oauth2login/spring-security-samples-boot-oauth2-oauth2login.gradle
+++ b/samples/boot/oauth2/oauth2login/spring-security-samples-boot-oauth2-oauth2login.gradle
--- a/samples/boot/oauth2/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java
+++ b/samples/boot/oauth2/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java
--- a/samples/boot/oauth2/oauth2login/src/main/java/sample/OAuth2LoginApplication.java
+++ b/samples/boot/oauth2/oauth2login/src/main/java/sample/OAuth2LoginApplication.java
--- a/samples/boot/oauth2/oauth2login/src/main/java/sample/web/OAuth2LoginController.java
+++ b/samples/boot/oauth2/oauth2login/src/main/java/sample/web/OAuth2LoginController.java
--- a/samples/boot/oauth2/oauth2login/src/main/resources/application.yml
+++ b/samples/boot/oauth2/oauth2login/src/main/resources/application.yml
--- a/samples/boot/oauth2/oauth2login/src/main/resources/templates/index.html
+++ b/samples/boot/oauth2/oauth2login/src/main/resources/templates/index.html