diff --git a/servlet/java-configuration/preauth/build.gradle b/servlet/java-configuration/authentication/preauth/build.gradle similarity index 100% rename from servlet/java-configuration/preauth/build.gradle rename to servlet/java-configuration/authentication/preauth/build.gradle diff --git a/servlet/java-configuration/preauth/gradle.properties b/servlet/java-configuration/authentication/preauth/gradle.properties similarity index 100% rename from servlet/java-configuration/preauth/gradle.properties rename to servlet/java-configuration/authentication/preauth/gradle.properties diff --git a/servlet/java-configuration/preauth/gradle/gretty.gradle b/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle similarity index 100% rename from servlet/java-configuration/preauth/gradle/gretty.gradle rename to servlet/java-configuration/authentication/preauth/gradle/gretty.gradle diff --git a/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.jar b/servlet/java-configuration/authentication/preauth/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.jar rename to servlet/java-configuration/authentication/preauth/gradle/wrapper/gradle-wrapper.jar diff --git a/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.properties b/servlet/java-configuration/authentication/preauth/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.properties rename to servlet/java-configuration/authentication/preauth/gradle/wrapper/gradle-wrapper.properties diff --git a/servlet/java-configuration/preauth/gradlew b/servlet/java-configuration/authentication/preauth/gradlew similarity index 100% rename from servlet/java-configuration/preauth/gradlew rename to servlet/java-configuration/authentication/preauth/gradlew diff --git a/servlet/java-configuration/preauth/gradlew.bat b/servlet/java-configuration/authentication/preauth/gradlew.bat similarity index 100% rename from servlet/java-configuration/preauth/gradlew.bat rename to servlet/java-configuration/authentication/preauth/gradlew.bat diff --git a/servlet/java-configuration/preauth/server/tomcat85-users.xml b/servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml similarity index 100% rename from servlet/java-configuration/preauth/server/tomcat85-users.xml rename to servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml diff --git a/servlet/java-configuration/preauth/settings.gradle b/servlet/java-configuration/authentication/preauth/settings.gradle similarity index 100% rename from servlet/java-configuration/preauth/settings.gradle rename to servlet/java-configuration/authentication/preauth/settings.gradle diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java similarity index 100% rename from servlet/java-configuration/preauth/src/integTest/java/example/HelloWorldTests.java rename to servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/pages/HomePage.java b/servlet/java-configuration/authentication/preauth/src/integTest/java/example/pages/HomePage.java similarity index 100% rename from servlet/java-configuration/preauth/src/integTest/java/example/pages/HomePage.java rename to servlet/java-configuration/authentication/preauth/src/integTest/java/example/pages/HomePage.java diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/pages/LoginPage.java b/servlet/java-configuration/authentication/preauth/src/integTest/java/example/pages/LoginPage.java similarity index 100% rename from servlet/java-configuration/preauth/src/integTest/java/example/pages/LoginPage.java rename to servlet/java-configuration/authentication/preauth/src/integTest/java/example/pages/LoginPage.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/ApplicationConfiguration.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/ApplicationConfiguration.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/ApplicationConfiguration.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/ApplicationConfiguration.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/IndexController.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/IndexController.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/IndexController.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/IndexController.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/LoginController.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/LoginController.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/LoginController.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/LoginController.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/MvcWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/MvcWebApplicationInitializer.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/MvcWebApplicationInitializer.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/SecurityConfiguration.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/SecurityConfiguration.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/SecurityWebApplicationInitializer.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/SecurityWebApplicationInitializer.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityWebApplicationInitializer.java diff --git a/servlet/java-configuration/preauth/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/preauth/src/main/java/example/WebMvcConfiguration.java similarity index 100% rename from servlet/java-configuration/preauth/src/main/java/example/WebMvcConfiguration.java rename to servlet/java-configuration/authentication/preauth/src/main/java/example/WebMvcConfiguration.java diff --git a/servlet/java-configuration/preauth/src/main/resources/logback.xml b/servlet/java-configuration/authentication/preauth/src/main/resources/logback.xml similarity index 100% rename from servlet/java-configuration/preauth/src/main/resources/logback.xml rename to servlet/java-configuration/authentication/preauth/src/main/resources/logback.xml diff --git a/servlet/java-configuration/preauth/src/main/resources/templates/index.html b/servlet/java-configuration/authentication/preauth/src/main/resources/templates/index.html similarity index 100% rename from servlet/java-configuration/preauth/src/main/resources/templates/index.html rename to servlet/java-configuration/authentication/preauth/src/main/resources/templates/index.html diff --git a/servlet/java-configuration/preauth/src/main/resources/templates/login.html b/servlet/java-configuration/authentication/preauth/src/main/resources/templates/login.html similarity index 100% rename from servlet/java-configuration/preauth/src/main/resources/templates/login.html rename to servlet/java-configuration/authentication/preauth/src/main/resources/templates/login.html diff --git a/servlet/java-configuration/preauth/src/main/webapp/META-INF/MANIFEST.MF b/servlet/java-configuration/authentication/preauth/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from servlet/java-configuration/preauth/src/main/webapp/META-INF/MANIFEST.MF rename to servlet/java-configuration/authentication/preauth/src/main/webapp/META-INF/MANIFEST.MF diff --git a/servlet/java-configuration/preauth/src/main/webapp/WEB-INF/web.xml b/servlet/java-configuration/authentication/preauth/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from servlet/java-configuration/preauth/src/main/webapp/WEB-INF/web.xml rename to servlet/java-configuration/authentication/preauth/src/main/webapp/WEB-INF/web.xml diff --git a/servlet/java-configuration/preauth/src/main/webapp/login.html b/servlet/java-configuration/authentication/preauth/src/main/webapp/login.html similarity index 100% rename from servlet/java-configuration/preauth/src/main/webapp/login.html rename to servlet/java-configuration/authentication/preauth/src/main/webapp/login.html diff --git a/servlet/java-configuration/remember-me/build.gradle b/servlet/java-configuration/authentication/remember-me/build.gradle similarity index 100% rename from servlet/java-configuration/remember-me/build.gradle rename to servlet/java-configuration/authentication/remember-me/build.gradle diff --git a/servlet/java-configuration/remember-me/gradle.properties b/servlet/java-configuration/authentication/remember-me/gradle.properties similarity index 100% rename from servlet/java-configuration/remember-me/gradle.properties rename to servlet/java-configuration/authentication/remember-me/gradle.properties diff --git a/servlet/java-configuration/remember-me/gradle/gretty.gradle b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle similarity index 100% rename from servlet/java-configuration/remember-me/gradle/gretty.gradle rename to servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle diff --git a/servlet/java-configuration/remember-me/gradle/wrapper/gradle-wrapper.jar b/servlet/java-configuration/authentication/remember-me/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from servlet/java-configuration/remember-me/gradle/wrapper/gradle-wrapper.jar rename to servlet/java-configuration/authentication/remember-me/gradle/wrapper/gradle-wrapper.jar diff --git a/servlet/java-configuration/remember-me/gradle/wrapper/gradle-wrapper.properties b/servlet/java-configuration/authentication/remember-me/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from servlet/java-configuration/remember-me/gradle/wrapper/gradle-wrapper.properties rename to servlet/java-configuration/authentication/remember-me/gradle/wrapper/gradle-wrapper.properties diff --git a/servlet/java-configuration/remember-me/gradlew b/servlet/java-configuration/authentication/remember-me/gradlew similarity index 100% rename from servlet/java-configuration/remember-me/gradlew rename to servlet/java-configuration/authentication/remember-me/gradlew diff --git a/servlet/java-configuration/remember-me/gradlew.bat b/servlet/java-configuration/authentication/remember-me/gradlew.bat similarity index 100% rename from servlet/java-configuration/remember-me/gradlew.bat rename to servlet/java-configuration/authentication/remember-me/gradlew.bat diff --git a/servlet/java-configuration/remember-me/settings.gradle b/servlet/java-configuration/authentication/remember-me/settings.gradle similarity index 100% rename from servlet/java-configuration/remember-me/settings.gradle rename to servlet/java-configuration/authentication/remember-me/settings.gradle diff --git a/servlet/java-configuration/remember-me/src/main/integTest/java/example/FormLoginTests.java b/servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/FormLoginTests.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/integTest/java/example/FormLoginTests.java rename to servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/FormLoginTests.java diff --git a/servlet/java-configuration/remember-me/src/main/integTest/java/example/pages/CustomLoginPage.java b/servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/pages/CustomLoginPage.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/integTest/java/example/pages/CustomLoginPage.java rename to servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/pages/CustomLoginPage.java diff --git a/servlet/java-configuration/remember-me/src/main/integTest/java/example/pages/HomePage.java b/servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/pages/HomePage.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/integTest/java/example/pages/HomePage.java rename to servlet/java-configuration/authentication/remember-me/src/main/integTest/java/example/pages/HomePage.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/ApplicationConfiguration.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/ApplicationConfiguration.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/ApplicationConfiguration.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/ApplicationConfiguration.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/IndexController.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/IndexController.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/IndexController.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/IndexController.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/LoginController.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/LoginController.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/LoginController.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/LoginController.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/MvcWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/MvcWebApplicationInitializer.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/MvcWebApplicationInitializer.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/SecurityConfiguration.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/SecurityConfiguration.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityConfiguration.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/SecurityWebApplicationInitializer.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/SecurityWebApplicationInitializer.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/SecurityWebApplicationInitializer.java diff --git a/servlet/java-configuration/remember-me/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/remember-me/src/main/java/example/WebMvcConfiguration.java similarity index 100% rename from servlet/java-configuration/remember-me/src/main/java/example/WebMvcConfiguration.java rename to servlet/java-configuration/authentication/remember-me/src/main/java/example/WebMvcConfiguration.java diff --git a/servlet/java-configuration/remember-me/src/main/resources/logback.xml b/servlet/java-configuration/authentication/remember-me/src/main/resources/logback.xml similarity index 100% rename from servlet/java-configuration/remember-me/src/main/resources/logback.xml rename to servlet/java-configuration/authentication/remember-me/src/main/resources/logback.xml diff --git a/servlet/java-configuration/remember-me/src/main/resources/templates/index.html b/servlet/java-configuration/authentication/remember-me/src/main/resources/templates/index.html similarity index 100% rename from servlet/java-configuration/remember-me/src/main/resources/templates/index.html rename to servlet/java-configuration/authentication/remember-me/src/main/resources/templates/index.html diff --git a/servlet/java-configuration/remember-me/src/main/resources/templates/login.html b/servlet/java-configuration/authentication/remember-me/src/main/resources/templates/login.html similarity index 100% rename from servlet/java-configuration/remember-me/src/main/resources/templates/login.html rename to servlet/java-configuration/authentication/remember-me/src/main/resources/templates/login.html diff --git a/servlet/java-configuration/remember-me/src/test/java/example/RememberMeTests.java b/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java similarity index 100% rename from servlet/java-configuration/remember-me/src/test/java/example/RememberMeTests.java rename to servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java diff --git a/settings.gradle b/settings.gradle index a4da7a3..7907bfb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,6 +27,8 @@ include ":reactive:webflux:java:oauth2:resource-server" include ":reactive:webflux:java:oauth2:webclient" include ":reactive:webflux:kotlin:hello-security" include ":servlet:java-configuration:aspectj" +include ":servlet:java-configuration:authentication:preauth" +include ":servlet:java-configuration:authentication:remember-me" include ":servlet:java-configuration:authentication:username-password:form" include ":servlet:java-configuration:authentication:username-password:in-memory" include ":servlet:java-configuration:authentication:username-password:jdbc" @@ -36,8 +38,6 @@ include ":servlet:java-configuration:hello-mvc-security" include ":servlet:java-configuration:hello-security" include ":servlet:java-configuration:hello-security-explicit" include ":servlet:java-configuration:max-sessions" -include ":servlet:java-configuration:preauth" -include ":servlet:java-configuration:remember-me" include ":servlet:spring-boot:java:hello" include ":servlet:spring-boot:java:hello-security" include ":servlet:spring-boot:java:hello-security-explicit" @@ -52,3 +52,4 @@ include ":servlet:spring-boot:java:oauth2:webclient" include ":servlet:spring-boot:java:saml2-login" include ":servlet:spring-boot:kotlin:hello-security" +