diff --git a/servlet/java-configuration/form/build.gradle b/servlet/java-configuration/authentication/username-password/form/build.gradle similarity index 100% rename from servlet/java-configuration/form/build.gradle rename to servlet/java-configuration/authentication/username-password/form/build.gradle diff --git a/servlet/java-configuration/form/gradle.properties b/servlet/java-configuration/authentication/username-password/form/gradle.properties similarity index 100% rename from servlet/java-configuration/form/gradle.properties rename to servlet/java-configuration/authentication/username-password/form/gradle.properties diff --git a/servlet/java-configuration/form/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle similarity index 100% rename from servlet/java-configuration/form/gradle/gretty.gradle rename to servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle diff --git a/servlet/java-configuration/form/gradle/wrapper/gradle-wrapper.jar b/servlet/java-configuration/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from servlet/java-configuration/form/gradle/wrapper/gradle-wrapper.jar rename to servlet/java-configuration/authentication/username-password/form/gradle/wrapper/gradle-wrapper.jar diff --git a/servlet/java-configuration/form/gradle/wrapper/gradle-wrapper.properties b/servlet/java-configuration/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from servlet/java-configuration/form/gradle/wrapper/gradle-wrapper.properties rename to servlet/java-configuration/authentication/username-password/form/gradle/wrapper/gradle-wrapper.properties diff --git a/servlet/java-configuration/form/gradlew b/servlet/java-configuration/authentication/username-password/form/gradlew similarity index 100% rename from servlet/java-configuration/form/gradlew rename to servlet/java-configuration/authentication/username-password/form/gradlew diff --git a/servlet/java-configuration/form/gradlew.bat b/servlet/java-configuration/authentication/username-password/form/gradlew.bat similarity index 100% rename from servlet/java-configuration/form/gradlew.bat rename to servlet/java-configuration/authentication/username-password/form/gradlew.bat diff --git a/servlet/java-configuration/form/settings.gradle b/servlet/java-configuration/authentication/username-password/form/settings.gradle similarity index 100% rename from servlet/java-configuration/form/settings.gradle rename to servlet/java-configuration/authentication/username-password/form/settings.gradle diff --git a/servlet/java-configuration/form/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/HelloWorldTests.java similarity index 100% rename from servlet/java-configuration/form/src/integTest/java/example/HelloWorldTests.java rename to servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/HelloWorldTests.java diff --git a/servlet/java-configuration/form/src/integTest/java/example/pages/HomePage.java b/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/pages/HomePage.java similarity index 100% rename from servlet/java-configuration/form/src/integTest/java/example/pages/HomePage.java rename to servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/pages/HomePage.java diff --git a/servlet/java-configuration/form/src/integTest/java/example/pages/LoginPage.java b/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java similarity index 100% rename from servlet/java-configuration/form/src/integTest/java/example/pages/LoginPage.java rename to servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/pages/LoginPage.java diff --git a/servlet/java-configuration/form/src/main/java/example/ApplicationConfiguration.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/ApplicationConfiguration.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/ApplicationConfiguration.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/ApplicationConfiguration.java diff --git a/servlet/java-configuration/form/src/main/java/example/IndexController.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/IndexController.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/IndexController.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/IndexController.java diff --git a/servlet/java-configuration/form/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/MvcWebApplicationInitializer.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/MvcWebApplicationInitializer.java diff --git a/servlet/java-configuration/form/src/main/java/example/SecurityConfiguration.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityConfiguration.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/SecurityConfiguration.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityConfiguration.java diff --git a/servlet/java-configuration/form/src/main/java/example/SecurityWebApplicationInitializer.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityWebApplicationInitializer.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/SecurityWebApplicationInitializer.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/SecurityWebApplicationInitializer.java diff --git a/servlet/java-configuration/form/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java similarity index 100% rename from servlet/java-configuration/form/src/main/java/example/WebMvcConfiguration.java rename to servlet/java-configuration/authentication/username-password/form/src/main/java/example/WebMvcConfiguration.java diff --git a/servlet/java-configuration/form/src/main/resources/logback.xml b/servlet/java-configuration/authentication/username-password/form/src/main/resources/logback.xml similarity index 100% rename from servlet/java-configuration/form/src/main/resources/logback.xml rename to servlet/java-configuration/authentication/username-password/form/src/main/resources/logback.xml diff --git a/servlet/java-configuration/form/src/main/resources/templates/index.html b/servlet/java-configuration/authentication/username-password/form/src/main/resources/templates/index.html similarity index 100% rename from servlet/java-configuration/form/src/main/resources/templates/index.html rename to servlet/java-configuration/authentication/username-password/form/src/main/resources/templates/index.html diff --git a/servlet/java-configuration/form/src/main/resources/templates/login.html b/servlet/java-configuration/authentication/username-password/form/src/main/resources/templates/login.html similarity index 100% rename from servlet/java-configuration/form/src/main/resources/templates/login.html rename to servlet/java-configuration/authentication/username-password/form/src/main/resources/templates/login.html diff --git a/settings.gradle b/settings.gradle index 8af4746..42efea8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,8 +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:username-password:form" include ":servlet:java-configuration:data" -include ":servlet:java-configuration:form" include ":servlet:java-configuration:hello-mvc-security" include ":servlet:java-configuration:hello-security" include ":servlet:java-configuration:hello-security-explicit"