From 8fc0ea77cccbef74a06abbe003c5b2c3851a42f8 Mon Sep 17 00:00:00 2001 From: Krzysiek Date: Sun, 27 Dec 2020 12:59:42 +0100 Subject: [PATCH] JAVA-3543: Move spring-thymeleaf into spring-web-modules --- pom.xml | 2 -- spring-web-modules/pom.xml | 1 + .../spring-thymeleaf}/README.md | 0 .../spring-thymeleaf}/pom.xml | 2 +- .../main/java/com/baeldung/thymeleaf/config/InitSecurity.java | 0 .../src/main/java/com/baeldung/thymeleaf/config/WebApp.java | 0 .../main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java | 0 .../main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java | 0 .../java/com/baeldung/thymeleaf/controller/BookController.java | 0 .../java/com/baeldung/thymeleaf/controller/DatesController.java | 0 .../controller/ExpressionUtilityObjectsController.java | 0 .../com/baeldung/thymeleaf/controller/FragmentsController.java | 0 .../java/com/baeldung/thymeleaf/controller/HomeController.java | 0 .../com/baeldung/thymeleaf/controller/InliningController.java | 0 .../baeldung/thymeleaf/controller/LayoutDialectController.java | 0 .../com/baeldung/thymeleaf/controller/StudentController.java | 0 .../com/baeldung/thymeleaf/controller/TeacherController.java | 0 .../java/com/baeldung/thymeleaf/formatter/NameFormatter.java | 0 .../src/main/java/com/baeldung/thymeleaf/model/Book.java | 0 .../src/main/java/com/baeldung/thymeleaf/model/Student.java | 0 .../src/main/java/com/baeldung/thymeleaf/model/Teacher.java | 0 .../main/java/com/baeldung/thymeleaf/service/BookService.java | 0 .../src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java | 0 .../src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java | 0 .../main/java/com/baeldung/thymeleaf/utils/StudentUtils.java | 0 .../main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java | 0 .../spring-thymeleaf}/src/main/resources/logback.xml | 0 .../spring-thymeleaf}/src/main/resources/messages_en.properties | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/css/styles.css | 0 .../src/main/webapp/WEB-INF/js/studentCheck.js | 0 .../src/main/webapp/WEB-INF/txt/studentsList.txt | 0 .../src/main/webapp/WEB-INF/views/addStudent.html | 0 .../src/main/webapp/WEB-INF/views/content.html | 0 .../src/main/webapp/WEB-INF/views/csrfAttack.html | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/views/dates.html | 0 .../src/main/webapp/WEB-INF/views/fragments.html | 0 .../src/main/webapp/WEB-INF/views/fragments/forms.html | 0 .../src/main/webapp/WEB-INF/views/fragments/general.html | 0 .../src/main/webapp/WEB-INF/views/fragments/menus.html | 0 .../src/main/webapp/WEB-INF/views/fragments/subtitle.html | 0 .../src/main/webapp/WEB-INF/views/fragments/tables.html | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/views/home.html | 0 .../src/main/webapp/WEB-INF/views/inliningExample.html | 0 .../src/main/webapp/WEB-INF/views/listBooks.html | 0 .../src/main/webapp/WEB-INF/views/listStudents.html | 0 .../src/main/webapp/WEB-INF/views/listTeachers.html | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/views/markup.html | 0 .../src/main/webapp/WEB-INF/views/objects.html | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/views/other.html | 0 .../spring-thymeleaf}/src/main/webapp/WEB-INF/views/params.html | 0 .../src/main/webapp/WEB-INF/views/template.html | 0 .../src/test/java/com/baeldung/thymeleaf/SpringContextTest.java | 0 .../ExpressionUtilityObjectsControllerIntegrationTest.java | 0 .../baeldung/thymeleaf/controller/FragmentsIntegrationTest.java | 0 .../controller/LayoutDialectControllerIntegrationTest.java | 0 .../thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java | 0 56 files changed, 2 insertions(+), 3 deletions(-) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/README.md (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/pom.xml (99%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/config/WebApp.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/BookController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/FragmentsController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/InliningController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/LayoutDialectController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/model/Book.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/model/Student.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/model/Teacher.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/service/BookService.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/resources/logback.xml (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/resources/messages_en.properties (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/css/styles.css (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/js/studentCheck.js (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/txt/studentsList.txt (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/addStudent.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/content.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/csrfAttack.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/dates.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments/forms.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments/general.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments/menus.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments/subtitle.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/fragments/tables.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/home.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/inliningExample.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/listBooks.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/listStudents.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/listTeachers.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/markup.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/objects.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/other.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/params.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/main/webapp/WEB-INF/views/template.html (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/test/java/com/baeldung/thymeleaf/controller/LayoutDialectControllerIntegrationTest.java (100%) rename {spring-thymeleaf => spring-web-modules/spring-thymeleaf}/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java (100%) diff --git a/pom.xml b/pom.xml index a28089e05a..86de8a389c 100644 --- a/pom.xml +++ b/pom.xml @@ -695,7 +695,6 @@ spring-swagger-codegen spring-threads - spring-thymeleaf spring-thymeleaf-2 spring-thymeleaf-3 @@ -1169,7 +1168,6 @@ spring-static-resources spring-swagger-codegen - spring-thymeleaf spring-thymeleaf-2 spring-thymeleaf-3 diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index bf6fda09f4..bda3edda6a 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -18,6 +18,7 @@ spring-mvc-basics-2 spring-mvc-basics-3 spring-mvc-basics-4 + spring-thymeleaf diff --git a/spring-thymeleaf/README.md b/spring-web-modules/spring-thymeleaf/README.md similarity index 100% rename from spring-thymeleaf/README.md rename to spring-web-modules/spring-thymeleaf/README.md diff --git a/spring-thymeleaf/pom.xml b/spring-web-modules/spring-thymeleaf/pom.xml similarity index 99% rename from spring-thymeleaf/pom.xml rename to spring-web-modules/spring-thymeleaf/pom.xml index 30f77dd73e..7b0cd2c510 100644 --- a/spring-thymeleaf/pom.xml +++ b/spring-web-modules/spring-thymeleaf/pom.xml @@ -11,7 +11,7 @@ com.baeldung parent-spring-5 0.0.1-SNAPSHOT - ../parent-spring-5 + ../../parent-spring-5 diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/InitSecurity.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebApp.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebApp.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebApp.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebApp.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/BookController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/DatesController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FragmentsController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FragmentsController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FragmentsController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/FragmentsController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/HomeController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/InliningController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/InliningController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/InliningController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/InliningController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/LayoutDialectController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/LayoutDialectController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/LayoutDialectController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/LayoutDialectController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/StudentController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/controller/TeacherController.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/formatter/NameFormatter.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Book.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Book.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Book.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Book.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Student.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Student.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Student.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Student.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Teacher.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Teacher.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Teacher.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/model/Teacher.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/service/BookService.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/service/BookService.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/service/BookService.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/service/BookService.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/ArrayUtil.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/BookUtils.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/StudentUtils.java diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java b/spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java similarity index 100% rename from spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java rename to spring-web-modules/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/utils/TeacherUtils.java diff --git a/spring-thymeleaf/src/main/resources/logback.xml b/spring-web-modules/spring-thymeleaf/src/main/resources/logback.xml similarity index 100% rename from spring-thymeleaf/src/main/resources/logback.xml rename to spring-web-modules/spring-thymeleaf/src/main/resources/logback.xml diff --git a/spring-thymeleaf/src/main/resources/messages_en.properties b/spring-web-modules/spring-thymeleaf/src/main/resources/messages_en.properties similarity index 100% rename from spring-thymeleaf/src/main/resources/messages_en.properties rename to spring-web-modules/spring-thymeleaf/src/main/resources/messages_en.properties diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/css/styles.css b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/css/styles.css similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/css/styles.css rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/css/styles.css diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/js/studentCheck.js b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/studentCheck.js similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/js/studentCheck.js rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/js/studentCheck.js diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/txt/studentsList.txt b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/txt/studentsList.txt similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/txt/studentsList.txt rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/txt/studentsList.txt diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/addStudent.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/addStudent.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/addStudent.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/addStudent.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/content.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/content.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/content.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/content.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/csrfAttack.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/csrfAttack.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/csrfAttack.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/csrfAttack.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/dates.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/dates.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/dates.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/dates.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/forms.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/forms.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/forms.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/forms.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/general.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/general.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/general.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/general.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/menus.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/menus.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/menus.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/menus.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/subtitle.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/subtitle.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/subtitle.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/subtitle.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/tables.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/tables.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/tables.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/fragments/tables.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/home.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/home.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/home.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/home.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/inliningExample.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/inliningExample.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/inliningExample.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/inliningExample.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/listBooks.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listBooks.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/listBooks.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listBooks.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/listStudents.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listStudents.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/listStudents.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listStudents.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/listTeachers.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listTeachers.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/listTeachers.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/listTeachers.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/markup.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/markup.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/markup.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/markup.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/objects.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/objects.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/objects.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/objects.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/other.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/other.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/other.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/other.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/params.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/params.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/params.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/params.html diff --git a/spring-thymeleaf/src/main/webapp/WEB-INF/views/template.html b/spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/template.html similarity index 100% rename from spring-thymeleaf/src/main/webapp/WEB-INF/views/template.html rename to spring-web-modules/spring-thymeleaf/src/main/webapp/WEB-INF/views/template.html diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java similarity index 100% rename from spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java rename to spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextTest.java diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java similarity index 100% rename from spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java rename to spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/ExpressionUtilityObjectsControllerIntegrationTest.java diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java similarity index 100% rename from spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java rename to spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/FragmentsIntegrationTest.java diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/LayoutDialectControllerIntegrationTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/LayoutDialectControllerIntegrationTest.java similarity index 100% rename from spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/LayoutDialectControllerIntegrationTest.java rename to spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/controller/LayoutDialectControllerIntegrationTest.java diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java b/spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java similarity index 100% rename from spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java rename to spring-web-modules/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/security/csrf/CsrfEnabledIntegrationTest.java