From 7d915468aed16b8a5a9dbee16d51372418db721b Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 8 Oct 2021 15:25:20 -0600 Subject: [PATCH] Move Saml2 Login Sample To make room for more SAML 2.0 samples! --- README.adoc | 4 ++-- .../java/{saml2-login => saml2/login}/README.adoc | 0 .../java/{saml2-login => saml2/login}/build.gradle | 0 .../{saml2-login => saml2/login}/gradle.properties | 0 .../login}/gradle/wrapper/gradle-wrapper.jar | Bin .../login}/gradle/wrapper/gradle-wrapper.properties | 0 .../java/{saml2-login => saml2/login}/gradlew | 0 .../java/{saml2-login => saml2/login}/gradlew.bat | 0 .../{saml2-login => saml2/login}/settings.gradle | 0 .../java/example/Saml2LoginApplicationITests.java | 0 .../src/main/java/example/IndexController.java | 0 .../main/java/example/Saml2LoginApplication.java | 0 .../main/java/example/SecurityConfiguration.java | 0 .../login}/src/main/resources/application.yml | 0 .../main/resources/credentials/idp-certificate.crt | 0 .../main/resources/credentials/rp-certificate.crt | 0 .../src/main/resources/credentials/rp-private.key | 0 .../login}/src/main/resources/templates/index.html | 0 settings.gradle | 2 +- 19 files changed, 3 insertions(+), 3 deletions(-) rename servlet/spring-boot/java/{saml2-login => saml2/login}/README.adoc (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/build.gradle (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/gradle.properties (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/gradle/wrapper/gradle-wrapper.jar (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/gradle/wrapper/gradle-wrapper.properties (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/gradlew (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/gradlew.bat (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/settings.gradle (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/integTest/java/example/Saml2LoginApplicationITests.java (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/java/example/IndexController.java (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/java/example/Saml2LoginApplication.java (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/java/example/SecurityConfiguration.java (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/resources/application.yml (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/resources/credentials/idp-certificate.crt (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/resources/credentials/rp-certificate.crt (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/resources/credentials/rp-private.key (100%) rename servlet/spring-boot/java/{saml2-login => saml2/login}/src/main/resources/templates/index.html (100%) diff --git a/README.adoc b/README.adoc index b3542c4..512f2c3 100644 --- a/README.adoc +++ b/README.adoc @@ -42,7 +42,7 @@ Samples for https://github.com/spring-projects/spring-security === SAML 2.0 -* https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/saml2-login[Login & Logout] +* https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/saml2/login[Login & Logout] === Authentication @@ -68,4 +68,4 @@ Samples for https://github.com/spring-projects/spring-security === JWT -* Login - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/jwt/login[Spring Boot] \ No newline at end of file +* Login - https://github.com/spring-projects/spring-security-samples/tree/main/servlet/spring-boot/java/jwt/login[Spring Boot] diff --git a/servlet/spring-boot/java/saml2-login/README.adoc b/servlet/spring-boot/java/saml2/login/README.adoc similarity index 100% rename from servlet/spring-boot/java/saml2-login/README.adoc rename to servlet/spring-boot/java/saml2/login/README.adoc diff --git a/servlet/spring-boot/java/saml2-login/build.gradle b/servlet/spring-boot/java/saml2/login/build.gradle similarity index 100% rename from servlet/spring-boot/java/saml2-login/build.gradle rename to servlet/spring-boot/java/saml2/login/build.gradle diff --git a/servlet/spring-boot/java/saml2-login/gradle.properties b/servlet/spring-boot/java/saml2/login/gradle.properties similarity index 100% rename from servlet/spring-boot/java/saml2-login/gradle.properties rename to servlet/spring-boot/java/saml2/login/gradle.properties diff --git a/servlet/spring-boot/java/saml2-login/gradle/wrapper/gradle-wrapper.jar b/servlet/spring-boot/java/saml2/login/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from servlet/spring-boot/java/saml2-login/gradle/wrapper/gradle-wrapper.jar rename to servlet/spring-boot/java/saml2/login/gradle/wrapper/gradle-wrapper.jar diff --git a/servlet/spring-boot/java/saml2-login/gradle/wrapper/gradle-wrapper.properties b/servlet/spring-boot/java/saml2/login/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from servlet/spring-boot/java/saml2-login/gradle/wrapper/gradle-wrapper.properties rename to servlet/spring-boot/java/saml2/login/gradle/wrapper/gradle-wrapper.properties diff --git a/servlet/spring-boot/java/saml2-login/gradlew b/servlet/spring-boot/java/saml2/login/gradlew similarity index 100% rename from servlet/spring-boot/java/saml2-login/gradlew rename to servlet/spring-boot/java/saml2/login/gradlew diff --git a/servlet/spring-boot/java/saml2-login/gradlew.bat b/servlet/spring-boot/java/saml2/login/gradlew.bat similarity index 100% rename from servlet/spring-boot/java/saml2-login/gradlew.bat rename to servlet/spring-boot/java/saml2/login/gradlew.bat diff --git a/servlet/spring-boot/java/saml2-login/settings.gradle b/servlet/spring-boot/java/saml2/login/settings.gradle similarity index 100% rename from servlet/spring-boot/java/saml2-login/settings.gradle rename to servlet/spring-boot/java/saml2/login/settings.gradle diff --git a/servlet/spring-boot/java/saml2-login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/integTest/java/example/Saml2LoginApplicationITests.java rename to servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java diff --git a/servlet/spring-boot/java/saml2-login/src/main/java/example/IndexController.java b/servlet/spring-boot/java/saml2/login/src/main/java/example/IndexController.java similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/java/example/IndexController.java rename to servlet/spring-boot/java/saml2/login/src/main/java/example/IndexController.java diff --git a/servlet/spring-boot/java/saml2-login/src/main/java/example/Saml2LoginApplication.java b/servlet/spring-boot/java/saml2/login/src/main/java/example/Saml2LoginApplication.java similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/java/example/Saml2LoginApplication.java rename to servlet/spring-boot/java/saml2/login/src/main/java/example/Saml2LoginApplication.java diff --git a/servlet/spring-boot/java/saml2-login/src/main/java/example/SecurityConfiguration.java b/servlet/spring-boot/java/saml2/login/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/java/example/SecurityConfiguration.java rename to servlet/spring-boot/java/saml2/login/src/main/java/example/SecurityConfiguration.java diff --git a/servlet/spring-boot/java/saml2-login/src/main/resources/application.yml b/servlet/spring-boot/java/saml2/login/src/main/resources/application.yml similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/resources/application.yml rename to servlet/spring-boot/java/saml2/login/src/main/resources/application.yml diff --git a/servlet/spring-boot/java/saml2-login/src/main/resources/credentials/idp-certificate.crt b/servlet/spring-boot/java/saml2/login/src/main/resources/credentials/idp-certificate.crt similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/resources/credentials/idp-certificate.crt rename to servlet/spring-boot/java/saml2/login/src/main/resources/credentials/idp-certificate.crt diff --git a/servlet/spring-boot/java/saml2-login/src/main/resources/credentials/rp-certificate.crt b/servlet/spring-boot/java/saml2/login/src/main/resources/credentials/rp-certificate.crt similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/resources/credentials/rp-certificate.crt rename to servlet/spring-boot/java/saml2/login/src/main/resources/credentials/rp-certificate.crt diff --git a/servlet/spring-boot/java/saml2-login/src/main/resources/credentials/rp-private.key b/servlet/spring-boot/java/saml2/login/src/main/resources/credentials/rp-private.key similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/resources/credentials/rp-private.key rename to servlet/spring-boot/java/saml2/login/src/main/resources/credentials/rp-private.key diff --git a/servlet/spring-boot/java/saml2-login/src/main/resources/templates/index.html b/servlet/spring-boot/java/saml2/login/src/main/resources/templates/index.html similarity index 100% rename from servlet/spring-boot/java/saml2-login/src/main/resources/templates/index.html rename to servlet/spring-boot/java/saml2/login/src/main/resources/templates/index.html diff --git a/settings.gradle b/settings.gradle index 4d2c9b3..e71c8be 100644 --- a/settings.gradle +++ b/settings.gradle @@ -54,7 +54,7 @@ include ":servlet:spring-boot:java:oauth2:resource-server:multi-tenancy" include ":servlet:spring-boot:java:oauth2:resource-server:opaque" include ":servlet:spring-boot:java:oauth2:resource-server:static" include ":servlet:spring-boot:java:oauth2:webclient" -include ":servlet:spring-boot:java:saml2-login" +include ":servlet:spring-boot:java:saml2:login" include ":servlet:spring-boot:kotlin:hello-security" include ":servlet:xml:java:helloworld" include ":servlet:xml:java:preauth"