From eb8724a0d71eecef9530ff157ba264674a8d6ec5 Mon Sep 17 00:00:00 2001 From: Krzysztof Woyke Date: Mon, 28 Dec 2020 12:10:31 +0100 Subject: [PATCH] JAVA-3544: Move spring-thymeleaf-2 into spring-web-modules --- pom.xml | 2 -- spring-web-modules/pom.xml | 1 + .../spring-thymeleaf-2}/README.md | 0 .../spring-thymeleaf-2}/pom.xml | 2 +- .../src/main/java/com/baeldung/thymeleaf/Application.java | 0 .../src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java | 0 .../com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java | 0 .../booleanexpressions/BooleanExpressionsController.java | 0 .../src/main/java/com/baeldung/thymeleaf/customhtml/Course.java | 0 .../thymeleaf/customhtml/CourseRegistrationController.java | 0 .../src/main/java/com/baeldung/thymeleaf/enums/Color.java | 0 .../src/main/java/com/baeldung/thymeleaf/enums/Widget.java | 0 .../java/com/baeldung/thymeleaf/enums/WidgetController.java | 0 .../main/java/com/baeldung/thymeleaf/lists/ListsController.java | 0 .../main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java | 0 .../java/com/baeldung/thymeleaf/mvcdata/EmailController.java | 0 .../com/baeldung/thymeleaf/mvcdata/repository/EmailData.java | 0 .../main/java/com/baeldung/thymeleaf/pathvariables/Detail.java | 0 .../main/java/com/baeldung/thymeleaf/pathvariables/Item.java | 0 .../thymeleaf/pathvariables/PathVariablesController.java | 0 .../thymeleaf/requestparameters/ParticipantController.java | 0 .../com/baeldung/thymeleaf/templatedir/HelloController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/templates-2/hello.html | 0 .../src/main/resources/templates-2/participants.html | 0 .../src/main/resources/templates/booleans.html | 0 .../src/main/resources/templates/continents.html | 0 .../src/main/resources/templates/courseRegistration.html | 0 .../src/main/resources/templates/enums/new.html | 0 .../src/main/resources/templates/enums/view.html | 0 .../src/main/resources/templates/lists/contains.html | 0 .../src/main/resources/templates/lists/isEmpty.html | 0 .../src/main/resources/templates/lists/size.html | 0 .../src/main/resources/templates/lists/sort.html | 0 .../src/main/resources/templates/lists/toList.html | 0 .../src/main/resources/templates/mvcdata/email-bean-data.html | 0 .../resources/templates/mvcdata/email-model-attributes.html | 0 .../resources/templates/mvcdata/email-request-parameters.html | 0 .../main/resources/templates/mvcdata/email-servlet-context.html | 0 .../resources/templates/mvcdata/email-session-attributes.html | 0 .../src/main/resources/templates/pathvariables/index.html | 0 .../src/main/resources/templates/pathvariables/view.html | 0 .../thymeleaf/lists/ListsControllerIntegrationTest.java | 0 .../com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java | 0 44 files changed, 2 insertions(+), 3 deletions(-) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/README.md (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/pom.xml (97%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/Application.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/booleanexpressions/BooleanExpressionsController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/customhtml/Course.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/customhtml/CourseRegistrationController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/enums/Color.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/enums/Widget.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/enums/WidgetController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/requestparameters/ParticipantController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/application.properties (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates-2/hello.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates-2/participants.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/booleans.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/continents.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/courseRegistration.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/enums/new.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/enums/view.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/lists/contains.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/lists/isEmpty.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/lists/size.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/lists/sort.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/lists/toList.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/mvcdata/email-bean-data.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/mvcdata/email-model-attributes.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/mvcdata/email-request-parameters.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/mvcdata/email-servlet-context.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/mvcdata/email-session-attributes.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/pathvariables/index.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/main/resources/templates/pathvariables/view.html (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java (100%) rename {spring-thymeleaf-2 => spring-web-modules/spring-thymeleaf-2}/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java (100%) diff --git a/pom.xml b/pom.xml index 204b873c58..f66433c612 100644 --- a/pom.xml +++ b/pom.xml @@ -694,7 +694,6 @@ spring-swagger-codegen spring-threads - spring-thymeleaf-2 spring-thymeleaf-3 spring-vault @@ -1165,7 +1164,6 @@ spring-static-resources spring-swagger-codegen - spring-thymeleaf-2 spring-thymeleaf-3 spring-vault diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index c1a85188d2..910af6a1bc 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -21,6 +21,7 @@ spring-mvc-crash spring-mvc-forms-jsp spring-thymeleaf + spring-thymeleaf-2 diff --git a/spring-thymeleaf-2/README.md b/spring-web-modules/spring-thymeleaf-2/README.md similarity index 100% rename from spring-thymeleaf-2/README.md rename to spring-web-modules/spring-thymeleaf-2/README.md diff --git a/spring-thymeleaf-2/pom.xml b/spring-web-modules/spring-thymeleaf-2/pom.xml similarity index 97% rename from spring-thymeleaf-2/pom.xml rename to spring-web-modules/spring-thymeleaf-2/pom.xml index 43f36d9887..ddcd1e1005 100644 --- a/spring-thymeleaf-2/pom.xml +++ b/spring-web-modules/spring-thymeleaf-2/pom.xml @@ -10,7 +10,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/Application.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/Application.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/Application.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/Application.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/ThymeleafConfig.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/arrays/ThymeleafArrayController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/booleanexpressions/BooleanExpressionsController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/booleanexpressions/BooleanExpressionsController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/booleanexpressions/BooleanExpressionsController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/booleanexpressions/BooleanExpressionsController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/Course.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/Course.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/Course.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/Course.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/CourseRegistrationController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/CourseRegistrationController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/CourseRegistrationController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/customhtml/CourseRegistrationController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Color.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Color.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Color.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Color.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Widget.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Widget.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Widget.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/Widget.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/WidgetController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/WidgetController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/WidgetController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/enums/WidgetController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/lists/ListsController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/BeanConfig.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/EmailController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/mvcdata/repository/EmailData.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Detail.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/Item.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/pathvariables/PathVariablesController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/requestparameters/ParticipantController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/requestparameters/ParticipantController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/requestparameters/ParticipantController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/requestparameters/ParticipantController.java diff --git a/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java b/spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java similarity index 100% rename from spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java rename to spring-web-modules/spring-thymeleaf-2/src/main/java/com/baeldung/thymeleaf/templatedir/HelloController.java diff --git a/spring-thymeleaf-2/src/main/resources/application.properties b/spring-web-modules/spring-thymeleaf-2/src/main/resources/application.properties similarity index 100% rename from spring-thymeleaf-2/src/main/resources/application.properties rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/application.properties diff --git a/spring-thymeleaf-2/src/main/resources/templates-2/hello.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates-2/hello.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates-2/hello.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates-2/hello.html diff --git a/spring-thymeleaf-2/src/main/resources/templates-2/participants.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates-2/participants.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates-2/participants.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates-2/participants.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/booleans.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/booleans.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/booleans.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/booleans.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/continents.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/continents.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/continents.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/continents.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/courseRegistration.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/courseRegistration.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/courseRegistration.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/courseRegistration.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/enums/new.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/enums/new.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/enums/new.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/enums/new.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/enums/view.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/enums/view.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/enums/view.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/enums/view.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/lists/contains.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/contains.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/isEmpty.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/size.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/size.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/lists/size.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/size.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/lists/sort.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/sort.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/lists/toList.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/lists/toList.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-bean-data.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-bean-data.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-bean-data.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-bean-data.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-model-attributes.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-model-attributes.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-model-attributes.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-model-attributes.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-request-parameters.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-request-parameters.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-request-parameters.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-request-parameters.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-servlet-context.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-servlet-context.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-servlet-context.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-servlet-context.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-session-attributes.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-session-attributes.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-session-attributes.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/mvcdata/email-session-attributes.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/pathvariables/index.html diff --git a/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html b/spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html similarity index 100% rename from spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html rename to spring-web-modules/spring-thymeleaf-2/src/main/resources/templates/pathvariables/view.html diff --git a/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java b/spring-web-modules/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java similarity index 100% rename from spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java rename to spring-web-modules/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/lists/ListsControllerIntegrationTest.java diff --git a/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java b/spring-web-modules/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java similarity index 100% rename from spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java rename to spring-web-modules/spring-thymeleaf-2/src/test/java/com/baeldung/thymeleaf/mvcdata/EmailControllerUnitTest.java