diff --git a/docs/manual/src/docs/asciidoc/_includes/preface/guides.adoc b/docs/manual/src/docs/asciidoc/_includes/preface/guides.adoc index d6cf49dda5..8749067886 100644 --- 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/oauth2/oauth2login[OAuth 2.0 Login] +| {gh-samples-url}/boot/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/oauth2/oauth2login/README.adoc[OAuth 2.0 Login Guide] +| link:{gh-samples-url}/boot/oauth2login/README.adoc[OAuth 2.0 Login Guide] |=== diff --git a/docs/manual/src/docs/asciidoc/_includes/preface/java-configuration.adoc b/docs/manual/src/docs/asciidoc/_includes/preface/java-configuration.adoc index 7b5f78e9e7..4f2d9ebbef 100644 --- 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/oauth2/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/oauth2login[*OAuth 2.0 Login sample*] using _Google_ as the _Authentication Provider_ and covers the following topics: * <> * <> diff --git a/samples/boot/oauth2/authcodegrant/README.adoc b/samples/boot/authcodegrant/README.adoc similarity index 100% rename from samples/boot/oauth2/authcodegrant/README.adoc rename to samples/boot/authcodegrant/README.adoc diff --git a/samples/boot/oauth2/authcodegrant/spring-security-samples-boot-oauth2-authcodegrant.gradle b/samples/boot/authcodegrant/spring-security-samples-boot-authcodegrant.gradle similarity index 100% rename from samples/boot/oauth2/authcodegrant/spring-security-samples-boot-oauth2-authcodegrant.gradle rename to samples/boot/authcodegrant/spring-security-samples-boot-authcodegrant.gradle diff --git a/samples/boot/oauth2/authcodegrant/src/integration-test/java/org/springframework/security/samples/OAuth2AuthorizationCodeGrantApplicationTests.java b/samples/boot/authcodegrant/src/integration-test/java/org/springframework/security/samples/OAuth2AuthorizationCodeGrantApplicationTests.java similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/integration-test/java/org/springframework/security/samples/OAuth2AuthorizationCodeGrantApplicationTests.java rename to samples/boot/authcodegrant/src/integration-test/java/org/springframework/security/samples/OAuth2AuthorizationCodeGrantApplicationTests.java diff --git a/samples/boot/oauth2/authcodegrant/src/main/java/sample/OAuth2AuthorizationCodeGrantApplication.java b/samples/boot/authcodegrant/src/main/java/sample/OAuth2AuthorizationCodeGrantApplication.java similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/java/sample/OAuth2AuthorizationCodeGrantApplication.java rename to samples/boot/authcodegrant/src/main/java/sample/OAuth2AuthorizationCodeGrantApplication.java diff --git a/samples/boot/oauth2/authcodegrant/src/main/java/sample/config/SecurityConfig.java b/samples/boot/authcodegrant/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/authcodegrant/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/oauth2/authcodegrant/src/main/java/sample/config/WebClientConfig.java b/samples/boot/authcodegrant/src/main/java/sample/config/WebClientConfig.java similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/java/sample/config/WebClientConfig.java rename to samples/boot/authcodegrant/src/main/java/sample/config/WebClientConfig.java diff --git a/samples/boot/oauth2/authcodegrant/src/main/java/sample/web/GitHubReposController.java b/samples/boot/authcodegrant/src/main/java/sample/web/GitHubReposController.java similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/java/sample/web/GitHubReposController.java rename to samples/boot/authcodegrant/src/main/java/sample/web/GitHubReposController.java diff --git a/samples/boot/oauth2/authcodegrant/src/main/resources/application.yml b/samples/boot/authcodegrant/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/resources/application.yml rename to samples/boot/authcodegrant/src/main/resources/application.yml diff --git a/samples/boot/oauth2/authcodegrant/src/main/resources/templates/github-repos.html b/samples/boot/authcodegrant/src/main/resources/templates/github-repos.html similarity index 100% rename from samples/boot/oauth2/authcodegrant/src/main/resources/templates/github-repos.html rename to samples/boot/authcodegrant/src/main/resources/templates/github-repos.html diff --git a/samples/boot/oauth2/oauth2login-webflux/README.adoc b/samples/boot/oauth2login-webflux/README.adoc similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/README.adoc rename to samples/boot/oauth2login-webflux/README.adoc diff --git a/samples/boot/oauth2/oauth2login-webflux/spring-security-samples-boot-oauth2-oauth2login-webflux.gradle b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/spring-security-samples-boot-oauth2-oauth2login-webflux.gradle rename to samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java b/samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java rename to samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientAutoConfiguration.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java b/samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java rename to samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2ClientRegistrationRepositoryConfiguration.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java b/samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java rename to samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ReactiveOAuth2WebSecurityConfiguration.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java b/samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java rename to samples/boot/oauth2login-webflux/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/package-info.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java b/samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java rename to samples/boot/oauth2login-webflux/src/main/java/sample/ReactiveOAuth2LoginApplication.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java b/samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java rename to samples/boot/oauth2login-webflux/src/main/java/sample/web/OAuth2LoginController.java diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/META-INF/spring.factories b/samples/boot/oauth2login-webflux/src/main/resources/META-INF/spring.factories similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/resources/META-INF/spring.factories rename to samples/boot/oauth2login-webflux/src/main/resources/META-INF/spring.factories diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/application.yml b/samples/boot/oauth2login-webflux/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/resources/application.yml rename to samples/boot/oauth2login-webflux/src/main/resources/application.yml diff --git a/samples/boot/oauth2/oauth2login-webflux/src/main/resources/templates/index.html b/samples/boot/oauth2login-webflux/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/oauth2/oauth2login-webflux/src/main/resources/templates/index.html rename to samples/boot/oauth2login-webflux/src/main/resources/templates/index.html diff --git a/samples/boot/oauth2/oauth2login/README.adoc b/samples/boot/oauth2login/README.adoc similarity index 100% rename from samples/boot/oauth2/oauth2login/README.adoc rename to samples/boot/oauth2login/README.adoc diff --git a/samples/boot/oauth2/oauth2login/spring-security-samples-boot-oauth2-oauth2login.gradle b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle similarity index 100% rename from samples/boot/oauth2/oauth2login/spring-security-samples-boot-oauth2-oauth2login.gradle rename to samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle diff --git a/samples/boot/oauth2/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java similarity index 100% rename from samples/boot/oauth2/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java rename to samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java diff --git a/samples/boot/oauth2/oauth2login/src/main/java/sample/OAuth2LoginApplication.java b/samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java similarity index 100% rename from samples/boot/oauth2/oauth2login/src/main/java/sample/OAuth2LoginApplication.java rename to samples/boot/oauth2login/src/main/java/sample/OAuth2LoginApplication.java diff --git a/samples/boot/oauth2/oauth2login/src/main/java/sample/web/OAuth2LoginController.java b/samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java similarity index 100% rename from samples/boot/oauth2/oauth2login/src/main/java/sample/web/OAuth2LoginController.java rename to samples/boot/oauth2login/src/main/java/sample/web/OAuth2LoginController.java diff --git a/samples/boot/oauth2/oauth2login/src/main/resources/application.yml b/samples/boot/oauth2login/src/main/resources/application.yml similarity index 100% rename from samples/boot/oauth2/oauth2login/src/main/resources/application.yml rename to samples/boot/oauth2login/src/main/resources/application.yml diff --git a/samples/boot/oauth2/oauth2login/src/main/resources/templates/index.html b/samples/boot/oauth2login/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/oauth2/oauth2login/src/main/resources/templates/index.html rename to samples/boot/oauth2login/src/main/resources/templates/index.html