diff --git a/pom.xml b/pom.xml index 89c030428d20..db7eaab83417 100644 --- a/pom.xml +++ b/pom.xml @@ -777,9 +777,6 @@ spring-batch spring-batch-2 spring-boot-modules - spring-boot-rest - spring-boot-rest-2 - spring-boot-rest-simple spring-cloud-modules/spring-cloud-bootstrap spring-cloud-modules/spring-cloud-circuit-breaker spring-cloud-modules/spring-cloud-contract @@ -819,16 +816,13 @@ spring-scheduling-2 spring-security-modules spring-shell - spring-soap spring-spel spring-state-machine - spring-static-resources spring-structurizr spring-swagger-codegen-modules/custom-validations-opeanpi-codegen spring-threads spring-vault spring-web-modules - spring-websockets static-analysis-modules tensorflow-java testing-modules @@ -1218,9 +1212,6 @@ spring-batch spring-batch-2 spring-boot-modules - spring-boot-rest - spring-boot-rest-2 - spring-boot-rest-simple spring-cloud-modules/spring-cloud-bootstrap spring-cloud-modules/spring-cloud-circuit-breaker spring-cloud-modules/spring-cloud-contract @@ -1260,16 +1251,13 @@ spring-scheduling-2 spring-security-modules spring-shell - spring-soap spring-spel spring-state-machine - spring-static-resources spring-structurizr spring-swagger-codegen-modules/custom-validations-opeanpi-codegen spring-threads spring-vault spring-web-modules - spring-websockets static-analysis-modules tensorflow-java testing-modules diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index b82792d33abe..ce31657c74a3 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -56,6 +56,12 @@ spring-thymeleaf-5 spring-web-url spring-thymeleaf-attributes + spring-websockets + spring-soap + spring-static-resources + spring-boot-rest + spring-boot-rest-2 + spring-boot-rest-simple diff --git a/spring-boot-rest-2/pom.xml b/spring-web-modules/spring-boot-rest-2/pom.xml similarity index 97% rename from spring-boot-rest-2/pom.xml rename to spring-web-modules/spring-boot-rest-2/pom.xml index 40e74d385cef..20dd696bb9c8 100644 --- a/spring-boot-rest-2/pom.xml +++ b/spring-web-modules/spring-boot-rest-2/pom.xml @@ -11,9 +11,8 @@ com.baeldung - parent-boot-3 + spring-web-modules 0.0.1-SNAPSHOT - ../parent-boot-3 diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/PaginatedResultsRetrievedEvent.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/PaginatedResultsRetrievedEvent.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/PaginatedResultsRetrievedEvent.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/PaginatedResultsRetrievedEvent.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/ResourceCreatedEvent.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/ResourceCreatedEvent.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/ResourceCreatedEvent.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/ResourceCreatedEvent.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/SingleResourceRetrievedEvent.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/SingleResourceRetrievedEvent.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/SingleResourceRetrievedEvent.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/event/SingleResourceRetrievedEvent.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/ResourceCreatedDiscoverabilityListener.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/ResourceCreatedDiscoverabilityListener.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/ResourceCreatedDiscoverabilityListener.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/ResourceCreatedDiscoverabilityListener.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/IOperations.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/IOperations.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/IOperations.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/IOperations.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/dao/IFooDao.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/dao/IFooDao.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/dao/IFooDao.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/dao/IFooDao.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Customer.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Customer.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Customer.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Customer.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Foo.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Foo.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Foo.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Foo.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Order.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Order.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Order.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/model/Order.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/IFooService.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/IFooService.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/IFooService.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/IFooService.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/common/AbstractService.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/common/AbstractService.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/common/AbstractService.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/common/AbstractService.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/impl/FooService.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/impl/FooService.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/impl/FooService.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/persistence/service/impl/FooService.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerService.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerService.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerService.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerService.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerServiceImpl.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerServiceImpl.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerServiceImpl.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/CustomerServiceImpl.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderService.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderService.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderService.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderService.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderServiceImpl.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderServiceImpl.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderServiceImpl.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/services/OrderServiceImpl.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/LinkUtil.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/LinkUtil.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/LinkUtil.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/LinkUtil.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/RestPreconditions.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/RestPreconditions.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/RestPreconditions.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/util/RestPreconditions.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/FooController.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/FooController.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/FooController.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/FooController.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/RootController.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/RootController.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/RootController.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/controller/RootController.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/exception/MyResourceNotFoundException.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/exception/MyResourceNotFoundException.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoas/web/exception/MyResourceNotFoundException.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/SpringBootRestApplication.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/SpringBootRestApplication.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/SpringBootRestApplication.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/SpringBootRestApplication.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserController.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserController.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserController.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserController.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserHateoasController.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserHateoasController.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserHateoasController.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/UserHateoasController.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/NewUser.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/NewUser.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/NewUser.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/NewUser.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/User.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/User.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/User.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/model/User.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/repository/UserRepository.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/repository/UserRepository.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/repository/UserRepository.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/hateoasvsswagger/repository/UserRepository.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/Book.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/Book.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/Book.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/Book.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookApplication.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookApplication.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookApplication.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookApplication.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookController.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookController.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookController.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookController.java diff --git a/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookRepository.java b/spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookRepository.java similarity index 100% rename from spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookRepository.java rename to spring-web-modules/spring-boot-rest-2/src/main/java/com/baeldung/smartdoc/BookRepository.java diff --git a/spring-boot-rest-2/src/main/resources/application.properties b/spring-web-modules/spring-boot-rest-2/src/main/resources/application.properties similarity index 100% rename from spring-boot-rest-2/src/main/resources/application.properties rename to spring-web-modules/spring-boot-rest-2/src/main/resources/application.properties diff --git a/spring-boot-rest-2/src/main/resources/doc/AllInOne.css b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/AllInOne.css similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/AllInOne.css rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/AllInOne.css diff --git a/spring-boot-rest-2/src/main/resources/doc/api.html b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/api.html similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/api.html rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/api.html diff --git a/spring-boot-rest-2/src/main/resources/doc/dict.html b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/dict.html similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/dict.html rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/dict.html diff --git a/spring-boot-rest-2/src/main/resources/doc/error.html b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/error.html similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/error.html rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/error.html diff --git a/spring-boot-rest-2/src/main/resources/doc/font.css b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/font.css similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/font.css rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/font.css diff --git a/spring-boot-rest-2/src/main/resources/doc/highlight.min.js b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/highlight.min.js similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/highlight.min.js rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/highlight.min.js diff --git a/spring-boot-rest-2/src/main/resources/doc/jquery.min.js b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/jquery.min.js similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/jquery.min.js rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/jquery.min.js diff --git a/spring-boot-rest-2/src/main/resources/doc/openapi.json b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/openapi.json similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/openapi.json rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/openapi.json diff --git a/spring-boot-rest-2/src/main/resources/doc/postman.json b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/postman.json similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/postman.json rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/postman.json diff --git a/spring-boot-rest-2/src/main/resources/doc/search.js b/spring-web-modules/spring-boot-rest-2/src/main/resources/doc/search.js similarity index 100% rename from spring-boot-rest-2/src/main/resources/doc/search.js rename to spring-web-modules/spring-boot-rest-2/src/main/resources/doc/search.js diff --git a/spring-boot-rest-2/src/main/resources/smart-doc.json b/spring-web-modules/spring-boot-rest-2/src/main/resources/smart-doc.json similarity index 100% rename from spring-boot-rest-2/src/main/resources/smart-doc.json rename to spring-web-modules/spring-boot-rest-2/src/main/resources/smart-doc.json diff --git a/spring-boot-rest-2/src/test/java/com/baeldung/hateoasvsswagger/HateoasControllerIntegrationTest.java b/spring-web-modules/spring-boot-rest-2/src/test/java/com/baeldung/hateoasvsswagger/HateoasControllerIntegrationTest.java similarity index 100% rename from spring-boot-rest-2/src/test/java/com/baeldung/hateoasvsswagger/HateoasControllerIntegrationTest.java rename to spring-web-modules/spring-boot-rest-2/src/test/java/com/baeldung/hateoasvsswagger/HateoasControllerIntegrationTest.java diff --git a/spring-boot-rest-simple/README.md b/spring-web-modules/spring-boot-rest-simple/README.md similarity index 100% rename from spring-boot-rest-simple/README.md rename to spring-web-modules/spring-boot-rest-simple/README.md diff --git a/spring-boot-rest-simple/pom.xml b/spring-web-modules/spring-boot-rest-simple/pom.xml similarity index 99% rename from spring-boot-rest-simple/pom.xml rename to spring-web-modules/spring-boot-rest-simple/pom.xml index 25e1123d93ab..41c818c26fe3 100644 --- a/spring-boot-rest-simple/pom.xml +++ b/spring-web-modules/spring-boot-rest-simple/pom.xml @@ -13,7 +13,7 @@ com.baeldung parent-boot-3 0.0.1-SNAPSHOT - ../parent-boot-3 + ../../parent-boot-3/pom.xml diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/SpringBootRestApplication.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/SpringBootRestApplication.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/SpringBootRestApplication.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/SpringBootRestApplication.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/IOperations.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/IOperations.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/IOperations.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/IOperations.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/dao/IFooDao.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/dao/IFooDao.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/dao/IFooDao.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/dao/IFooDao.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/model/Foo.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/model/Foo.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/model/Foo.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/model/Foo.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/IFooService.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/IFooService.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/IFooService.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/common/AbstractService.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/common/AbstractService.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/common/AbstractService.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/common/AbstractService.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/impl/FooService.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/impl/FooService.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/impl/FooService.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/persistence/service/impl/FooService.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ExamplePostController.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ExamplePostController.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ExamplePostController.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ExamplePostController.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/LoginForm.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/LoginForm.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/LoginForm.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/LoginForm.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ResponseTransfer.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ResponseTransfer.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ResponseTransfer.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/requestresponsebody/ResponseTransfer.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/services/ExampleService.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/services/ExampleService.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/services/ExampleService.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/services/ExampleService.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/controller/FooController.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/BadRequestException.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/BadRequestException.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/BadRequestException.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/BadRequestException.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java diff --git a/spring-boot-rest-simple/src/main/java/com/baeldung/web/util/RestPreconditions.java b/spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/util/RestPreconditions.java similarity index 100% rename from spring-boot-rest-simple/src/main/java/com/baeldung/web/util/RestPreconditions.java rename to spring-web-modules/spring-boot-rest-simple/src/main/java/com/baeldung/web/util/RestPreconditions.java diff --git a/spring-boot-rest-simple/src/main/resources/application.properties b/spring-web-modules/spring-boot-rest-simple/src/main/resources/application.properties similarity index 100% rename from spring-boot-rest-simple/src/main/resources/application.properties rename to spring-web-modules/spring-boot-rest-simple/src/main/resources/application.properties diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerRequestIntegrationTest.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerRequestIntegrationTest.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerRequestIntegrationTest.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerRequestIntegrationTest.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerResponseIntegrationTest.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerResponseIntegrationTest.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerResponseIntegrationTest.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/requestresponsebody/controllers/ExamplePostControllerResponseIntegrationTest.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GitHubUser.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GitHubUser.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/rest/GitHubUser.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GitHubUser.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GithubBasicLiveTest.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GithubBasicLiveTest.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/rest/GithubBasicLiveTest.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/GithubBasicLiveTest.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/rest/RetrieveUtil.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/RetrieveUtil.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/rest/RetrieveUtil.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/rest/RetrieveUtil.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java diff --git a/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java b/spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java similarity index 100% rename from spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java rename to spring-web-modules/spring-boot-rest-simple/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java diff --git a/spring-boot-rest/pom.xml b/spring-web-modules/spring-boot-rest/pom.xml similarity index 98% rename from spring-boot-rest/pom.xml rename to spring-web-modules/spring-boot-rest/pom.xml index dd71ac85b267..8148216e10ad 100644 --- a/spring-boot-rest/pom.xml +++ b/spring-web-modules/spring-boot-rest/pom.xml @@ -11,9 +11,8 @@ com.baeldung - parent-boot-3 + spring-web-modules 0.0.1-SNAPSHOT - ../parent-boot-3 diff --git a/spring-boot-rest/src/main/java/com/baeldung/SpringBootRestApplication.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/SpringBootRestApplication.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/SpringBootRestApplication.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/SpringBootRestApplication.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/IOperations.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/IOperations.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/IOperations.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/IOperations.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/config/CustomH2Dialect.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/config/CustomH2Dialect.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/config/CustomH2Dialect.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/config/CustomH2Dialect.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/dao/IFooDao.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/dao/IFooDao.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/dao/IFooDao.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/dao/IFooDao.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Customer.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Customer.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/model/Customer.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Customer.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Foo.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Foo.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/model/Foo.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Foo.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Order.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Order.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/model/Order.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/model/Order.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/IFooService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/service/IFooService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/IFooService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/service/common/AbstractService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/common/AbstractService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/service/common/AbstractService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/common/AbstractService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/persistence/service/impl/FooService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/impl/FooService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/persistence/service/impl/FooService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/persistence/service/impl/FooService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/services/CustomerService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/CustomerService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/services/CustomerService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/CustomerService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/services/CustomerServiceImpl.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/CustomerServiceImpl.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/services/CustomerServiceImpl.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/CustomerServiceImpl.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/services/OrderService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/OrderService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/services/OrderService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/OrderService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/services/OrderServiceImpl.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/OrderServiceImpl.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/services/OrderServiceImpl.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/services/OrderServiceImpl.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/spring/ConverterExtensionsConfig.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/ConverterExtensionsConfig.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/spring/ConverterExtensionsConfig.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/ConverterExtensionsConfig.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/spring/WebConfig.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/WebConfig.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/spring/WebConfig.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/spring/WebConfig.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/controller/PostRestController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/PostDto.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/dto/UserDto.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Post.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Preference.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/Subject.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/model/User.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/PostRepository.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/repository/SubjectRepository.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IPostService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/IUserService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/PostService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/springpagination/service/UserService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/CustomerController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/CustomerController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/CustomerController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/CustomerController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/FooController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/FooController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/FooController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/FooController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/RootController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/RootController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/RootController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/RootController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/Student.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/Student.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/students/Student.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/Student.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentController.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentController.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentController.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentController.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentService.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentService.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentService.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/controller/students/StudentService.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/error/CustomExceptionObject.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/CustomExceptionObject.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/error/CustomExceptionObject.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/CustomExceptionObject.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/error/MyGlobalExceptionHandler.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/MyGlobalExceptionHandler.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/error/MyGlobalExceptionHandler.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/MyGlobalExceptionHandler.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseEntityExceptionHandler.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseEntityExceptionHandler.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseEntityExceptionHandler.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseStatusExceptionResolver.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseStatusExceptionResolver.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseStatusExceptionResolver.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/error/RestResponseStatusExceptionResolver.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/BadRequestException.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException1.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException1.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException1.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException1.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException2.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException2.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException2.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException2.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException3.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException3.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException3.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException3.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException4.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException4.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException4.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException4.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException5.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException5.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException5.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/CustomException5.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/exception/ResourceNotFoundException.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/PaginatedResultsRetrievedEvent.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/ResourceCreatedEvent.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/ResourceCreatedEvent.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/ResourceCreatedEvent.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/ResourceCreatedEvent.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/event/SingleResourceRetrievedEvent.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/PaginatedResultsRetrievedDiscoverabilityListener.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/ResourceCreatedDiscoverabilityListener.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/hateoas/listener/SingleResourceRetrievedDiscoverabilityListener.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/util/LinkUtil.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/util/LinkUtil.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/util/LinkUtil.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/util/LinkUtil.java diff --git a/spring-boot-rest/src/main/java/com/baeldung/web/util/RestPreconditions.java b/spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/util/RestPreconditions.java similarity index 100% rename from spring-boot-rest/src/main/java/com/baeldung/web/util/RestPreconditions.java rename to spring-web-modules/spring-boot-rest/src/main/java/com/baeldung/web/util/RestPreconditions.java diff --git a/spring-boot-rest/src/main/resources/WEB-INF/web.xml b/spring-web-modules/spring-boot-rest/src/main/resources/WEB-INF/web.xml similarity index 100% rename from spring-boot-rest/src/main/resources/WEB-INF/web.xml rename to spring-web-modules/spring-boot-rest/src/main/resources/WEB-INF/web.xml diff --git a/spring-boot-rest/src/main/resources/application.properties b/spring-web-modules/spring-boot-rest/src/main/resources/application.properties similarity index 100% rename from spring-boot-rest/src/main/resources/application.properties rename to spring-web-modules/spring-boot-rest/src/main/resources/application.properties diff --git a/spring-boot-rest/src/main/resources/persistence-h2.properties b/spring-web-modules/spring-boot-rest/src/main/resources/persistence-h2.properties similarity index 100% rename from spring-boot-rest/src/main/resources/persistence-h2.properties rename to spring-web-modules/spring-boot-rest/src/main/resources/persistence-h2.properties diff --git a/spring-boot-rest/src/main/resources/persistence-mysql.properties b/spring-web-modules/spring-boot-rest/src/main/resources/persistence-mysql.properties similarity index 100% rename from spring-boot-rest/src/main/resources/persistence-mysql.properties rename to spring-web-modules/spring-boot-rest/src/main/resources/persistence-mysql.properties diff --git a/spring-boot-rest/src/test/java/com/baeldung/Consts.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/Consts.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/Consts.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/Consts.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractBasicLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractBasicLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractBasicLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractBasicLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractDiscoverabilityLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractDiscoverabilityLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractDiscoverabilityLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractDiscoverabilityLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/common/web/AbstractLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/spring/ConfigIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/spring/ConfigIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/spring/ConfigIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/spring/ConfigIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/springhateoas/CustomerControllerIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/springhateoas/CustomerControllerIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/springhateoas/CustomerControllerIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/springhateoas/CustomerControllerIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/springpagination/PostDtoUnitTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/test/IMarshaller.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/IMarshaller.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/test/IMarshaller.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/IMarshaller.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/test/JacksonMarshaller.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/JacksonMarshaller.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/test/JacksonMarshaller.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/JacksonMarshaller.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/test/TestMarshallerFactory.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/TestMarshallerFactory.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/test/TestMarshallerFactory.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/TestMarshallerFactory.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/test/XStreamMarshaller.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/XStreamMarshaller.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/test/XStreamMarshaller.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/test/XStreamMarshaller.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerAppIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerCustomEtagIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerCustomEtagIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooControllerCustomEtagIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerCustomEtagIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooControllerWebLayerIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooDiscoverabilityLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooDiscoverabilityLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooDiscoverabilityLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooDiscoverabilityLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooMessageConvertersLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooMessageConvertersLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooMessageConvertersLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooMessageConvertersLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/FooPageableLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooPageableLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/FooPageableLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/FooPageableLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/GlobalExceptionHandlerIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/GlobalExceptionHandlerIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/GlobalExceptionHandlerIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/GlobalExceptionHandlerIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/LiveTestSuiteLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/LiveTestSuiteLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/LiveTestSuiteLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/LiveTestSuiteLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/StudentControllerIntegrationTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/StudentControllerIntegrationTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/StudentControllerIntegrationTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/StudentControllerIntegrationTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java diff --git a/spring-boot-rest/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java b/spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java similarity index 100% rename from spring-boot-rest/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java rename to spring-web-modules/spring-boot-rest/src/test/java/com/baeldung/web/util/HTTPLinkHeaderUtil.java diff --git a/spring-boot-rest/src/test/resources/foo_API_test.postman_collection.json b/spring-web-modules/spring-boot-rest/src/test/resources/foo_API_test.postman_collection.json similarity index 100% rename from spring-boot-rest/src/test/resources/foo_API_test.postman_collection.json rename to spring-web-modules/spring-boot-rest/src/test/resources/foo_API_test.postman_collection.json diff --git a/spring-soap/.gitignore b/spring-web-modules/spring-soap/.gitignore similarity index 100% rename from spring-soap/.gitignore rename to spring-web-modules/spring-soap/.gitignore diff --git a/spring-soap/pom.xml b/spring-web-modules/spring-soap/pom.xml similarity index 97% rename from spring-soap/pom.xml rename to spring-web-modules/spring-soap/pom.xml index 33e74705a2af..3ce25d19259f 100644 --- a/spring-soap/pom.xml +++ b/spring-web-modules/spring-soap/pom.xml @@ -9,9 +9,8 @@ com.baeldung - parent-boot-3 + spring-web-modules 0.0.1-SNAPSHOT - ../parent-boot-3 diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/Application.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/Application.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/Application.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/Application.java diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/CountryEndpoint.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/CountryEndpoint.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/CountryEndpoint.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/CountryEndpoint.java diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/CountryRepository.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/CountryRepository.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/CountryRepository.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/CountryRepository.java diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/WebServiceConfig.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/WebServiceConfig.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/WebServiceConfig.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/WebServiceConfig.java diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClient.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClient.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClient.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClient.java diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClientConfig.java b/spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClientConfig.java similarity index 100% rename from spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClientConfig.java rename to spring-web-modules/spring-soap/src/main/java/com/baeldung/springsoap/client/CountryClientConfig.java diff --git a/spring-soap/src/main/resources/CountriesPortService.postman_collection.json b/spring-web-modules/spring-soap/src/main/resources/CountriesPortService.postman_collection.json similarity index 100% rename from spring-soap/src/main/resources/CountriesPortService.postman_collection.json rename to spring-web-modules/spring-soap/src/main/resources/CountriesPortService.postman_collection.json diff --git a/spring-soap/src/main/resources/countries.wsdl b/spring-web-modules/spring-soap/src/main/resources/countries.wsdl similarity index 100% rename from spring-soap/src/main/resources/countries.wsdl rename to spring-web-modules/spring-soap/src/main/resources/countries.wsdl diff --git a/spring-soap/src/main/resources/countries.xsd b/spring-web-modules/spring-soap/src/main/resources/countries.xsd similarity index 100% rename from spring-soap/src/main/resources/countries.xsd rename to spring-web-modules/spring-soap/src/main/resources/countries.xsd diff --git a/spring-soap/src/test/java/com/baeldung/springsoap/ApplicationIntegrationTest.java b/spring-web-modules/spring-soap/src/test/java/com/baeldung/springsoap/ApplicationIntegrationTest.java similarity index 100% rename from spring-soap/src/test/java/com/baeldung/springsoap/ApplicationIntegrationTest.java rename to spring-web-modules/spring-soap/src/test/java/com/baeldung/springsoap/ApplicationIntegrationTest.java diff --git a/spring-soap/src/test/java/com/baeldung/springsoap/client/CountryClientLiveTest.java b/spring-web-modules/spring-soap/src/test/java/com/baeldung/springsoap/client/CountryClientLiveTest.java similarity index 100% rename from spring-soap/src/test/java/com/baeldung/springsoap/client/CountryClientLiveTest.java rename to spring-web-modules/spring-soap/src/test/java/com/baeldung/springsoap/client/CountryClientLiveTest.java diff --git a/spring-soap/src/test/resources/request.xml b/spring-web-modules/spring-soap/src/test/resources/request.xml similarity index 100% rename from spring-soap/src/test/resources/request.xml rename to spring-web-modules/spring-soap/src/test/resources/request.xml diff --git a/spring-static-resources/pom.xml b/spring-web-modules/spring-static-resources/pom.xml similarity index 92% rename from spring-static-resources/pom.xml rename to spring-web-modules/spring-static-resources/pom.xml index fa39e6759216..0f58fb734c11 100644 --- a/spring-static-resources/pom.xml +++ b/spring-web-modules/spring-static-resources/pom.xml @@ -10,9 +10,8 @@ com.baeldung - parent-spring-6 + spring-web-modules 0.0.1-SNAPSHOT - ../parent-spring-6 @@ -186,10 +185,26 @@ + + org.springframework.boot + spring-boot-maven-plugin + + + repackage + + repackage + + + true + + + + + 6.2.8 6.3.3 3.0.2 6.0.0 diff --git a/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/LoadResourceConfig.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/LoadResourceConfig.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/LoadResourceConfig.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/LoadResourceConfig.java diff --git a/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/ResourceReader.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/ResourceReader.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/ResourceReader.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/loadresourceasstring/ResourceReader.java diff --git a/spring-static-resources/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java diff --git a/spring-static-resources/src/main/java/com/baeldung/spring/AppConfig.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/AppConfig.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/spring/AppConfig.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/AppConfig.java diff --git a/spring-static-resources/src/main/java/com/baeldung/spring/MvcConfig.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/MvcConfig.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/spring/MvcConfig.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/MvcConfig.java diff --git a/spring-static-resources/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/SecSecurityConfig.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/spring/SecSecurityConfig.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/spring/SecSecurityConfig.java diff --git a/spring-static-resources/src/main/java/com/baeldung/web/controller/HomeController.java b/spring-web-modules/spring-static-resources/src/main/java/com/baeldung/web/controller/HomeController.java similarity index 100% rename from spring-static-resources/src/main/java/com/baeldung/web/controller/HomeController.java rename to spring-web-modules/spring-static-resources/src/main/java/com/baeldung/web/controller/HomeController.java diff --git a/spring-static-resources/src/main/resources/application.properties b/spring-web-modules/spring-static-resources/src/main/resources/application.properties similarity index 100% rename from spring-static-resources/src/main/resources/application.properties rename to spring-web-modules/spring-static-resources/src/main/resources/application.properties diff --git a/spring-static-resources/src/main/resources/logback.xml b/spring-web-modules/spring-static-resources/src/main/resources/logback.xml similarity index 100% rename from spring-static-resources/src/main/resources/logback.xml rename to spring-web-modules/spring-static-resources/src/main/resources/logback.xml diff --git a/spring-static-resources/src/main/resources/messages_en.properties b/spring-web-modules/spring-static-resources/src/main/resources/messages_en.properties similarity index 100% rename from spring-static-resources/src/main/resources/messages_en.properties rename to spring-web-modules/spring-static-resources/src/main/resources/messages_en.properties diff --git a/spring-static-resources/src/main/resources/messages_es_ES.properties b/spring-web-modules/spring-static-resources/src/main/resources/messages_es_ES.properties similarity index 100% rename from spring-static-resources/src/main/resources/messages_es_ES.properties rename to spring-web-modules/spring-static-resources/src/main/resources/messages_es_ES.properties diff --git a/spring-static-resources/src/main/resources/resource.txt b/spring-web-modules/spring-static-resources/src/main/resources/resource.txt similarity index 100% rename from spring-static-resources/src/main/resources/resource.txt rename to spring-web-modules/spring-static-resources/src/main/resources/resource.txt diff --git a/spring-static-resources/src/main/resources/webSecurityConfig.xml b/spring-web-modules/spring-static-resources/src/main/resources/webSecurityConfig.xml similarity index 100% rename from spring-static-resources/src/main/resources/webSecurityConfig.xml rename to spring-web-modules/spring-static-resources/src/main/resources/webSecurityConfig.xml diff --git a/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/Hello.html diff --git a/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/classes/other-resources/bootstrap.css diff --git a/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/mvc-servlet.xml diff --git a/spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/view/home.jsp diff --git a/spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp diff --git a/spring-static-resources/src/main/webapp/WEB-INF/web.xml b/spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-static-resources/src/main/webapp/WEB-INF/web.xml rename to spring-web-modules/spring-static-resources/src/main/webapp/WEB-INF/web.xml diff --git a/spring-static-resources/src/main/webapp/js/bootstrap.css b/spring-web-modules/spring-static-resources/src/main/webapp/js/bootstrap.css similarity index 100% rename from spring-static-resources/src/main/webapp/js/bootstrap.css rename to spring-web-modules/spring-static-resources/src/main/webapp/js/bootstrap.css diff --git a/spring-static-resources/src/main/webapp/js/foo.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/foo.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/foo.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/foo.js diff --git a/spring-static-resources/src/main/webapp/js/handlebars-3133af2.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/handlebars-3133af2.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/handlebars-3133af2.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/handlebars-3133af2.js diff --git a/spring-static-resources/src/main/webapp/js/helpers/utils.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/helpers/utils.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/helpers/utils.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/helpers/utils.js diff --git a/spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/jquery-1.11.1.min.js diff --git a/spring-static-resources/src/main/webapp/js/main.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/main.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/main.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/main.js diff --git a/spring-static-resources/src/main/webapp/js/require.gz b/spring-web-modules/spring-static-resources/src/main/webapp/js/require.gz similarity index 100% rename from spring-static-resources/src/main/webapp/js/require.gz rename to spring-web-modules/spring-static-resources/src/main/webapp/js/require.gz diff --git a/spring-static-resources/src/main/webapp/js/require.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/require.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/require.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/require.js diff --git a/spring-static-resources/src/main/webapp/js/router.js b/spring-web-modules/spring-static-resources/src/main/webapp/js/router.js similarity index 100% rename from spring-static-resources/src/main/webapp/js/router.js rename to spring-web-modules/spring-static-resources/src/main/webapp/js/router.js diff --git a/spring-static-resources/src/main/webapp/other-resources/Hello.html b/spring-web-modules/spring-static-resources/src/main/webapp/other-resources/Hello.html similarity index 100% rename from spring-static-resources/src/main/webapp/other-resources/Hello.html rename to spring-web-modules/spring-static-resources/src/main/webapp/other-resources/Hello.html diff --git a/spring-static-resources/src/main/webapp/other-resources/bootstrap.css b/spring-web-modules/spring-static-resources/src/main/webapp/other-resources/bootstrap.css similarity index 100% rename from spring-static-resources/src/main/webapp/other-resources/bootstrap.css rename to spring-web-modules/spring-static-resources/src/main/webapp/other-resources/bootstrap.css diff --git a/spring-static-resources/src/main/webapp/other-resources/foo.js b/spring-web-modules/spring-static-resources/src/main/webapp/other-resources/foo.js similarity index 100% rename from spring-static-resources/src/main/webapp/other-resources/foo.js rename to spring-web-modules/spring-static-resources/src/main/webapp/other-resources/foo.js diff --git a/spring-static-resources/src/main/webapp/resources/bootstrap.css b/spring-web-modules/spring-static-resources/src/main/webapp/resources/bootstrap.css similarity index 100% rename from spring-static-resources/src/main/webapp/resources/bootstrap.css rename to spring-web-modules/spring-static-resources/src/main/webapp/resources/bootstrap.css diff --git a/spring-static-resources/src/main/webapp/resources/myCss.css b/spring-web-modules/spring-static-resources/src/main/webapp/resources/myCss.css similarity index 100% rename from spring-static-resources/src/main/webapp/resources/myCss.css rename to spring-web-modules/spring-static-resources/src/main/webapp/resources/myCss.css diff --git a/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-static-resources/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-static-resources/src/test/java/com/baeldung/loadresourceasstring/LoadResourceAsStringIntegrationTest.java b/spring-web-modules/spring-static-resources/src/test/java/com/baeldung/loadresourceasstring/LoadResourceAsStringIntegrationTest.java similarity index 100% rename from spring-static-resources/src/test/java/com/baeldung/loadresourceasstring/LoadResourceAsStringIntegrationTest.java rename to spring-web-modules/spring-static-resources/src/test/java/com/baeldung/loadresourceasstring/LoadResourceAsStringIntegrationTest.java diff --git a/spring-websockets/pom.xml b/spring-web-modules/spring-websockets/pom.xml similarity index 94% rename from spring-websockets/pom.xml rename to spring-web-modules/spring-websockets/pom.xml index 50f3097c1ba7..ffe2e652f1ab 100644 --- a/spring-websockets/pom.xml +++ b/spring-web-modules/spring-websockets/pom.xml @@ -9,9 +9,8 @@ com.baeldung - parent-boot-3 + spring-web-modules 0.0.1-SNAPSHOT - ../parent-boot-3 diff --git a/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/SpringBootApp.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/SpringBootApp.java diff --git a/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StockTicksController.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StockTicksController.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/debugwebsockets/StockTicksController.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StockTicksController.java diff --git a/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompClientSessionHandler.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompClientSessionHandler.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompClientSessionHandler.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompClientSessionHandler.java diff --git a/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompWebSocketClient.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompWebSocketClient.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompWebSocketClient.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/StompWebSocketClient.java diff --git a/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketApplication.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketApplication.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketApplication.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketApplication.java diff --git a/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketConfiguration.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketConfiguration.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketConfiguration.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/debugwebsockets/WebsocketConfiguration.java diff --git a/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketConfig.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketConfig.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketConfig.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketConfig.java diff --git a/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketHandler.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketHandler.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketHandler.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/rawwebsocket/ServerWebSocketHandler.java diff --git a/spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/sendtouser/WebSocketSendToUserConfig.java diff --git a/spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/sendtouser/WebsocketSendToUserController.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/BotsController.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/BotsController.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/BotsController.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/BotsController.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ChatController.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/Message.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/Message.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/Message.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/Message.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/OutputMessage.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/ReactiveScheduledPushMessages.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ReactiveScheduledPushMessages.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/ReactiveScheduledPushMessages.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ReactiveScheduledPushMessages.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/ScheduledPushMessages.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ScheduledPushMessages.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/ScheduledPushMessages.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/ScheduledPushMessages.java diff --git a/spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java b/spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java similarity index 100% rename from spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java rename to spring-web-modules/spring-websockets/src/main/java/com/baeldung/websockets/WebSocketConfig.java diff --git a/spring-websockets/src/main/webapp/bots.html b/spring-web-modules/spring-websockets/src/main/webapp/bots.html similarity index 100% rename from spring-websockets/src/main/webapp/bots.html rename to spring-web-modules/spring-websockets/src/main/webapp/bots.html diff --git a/spring-websockets/src/main/webapp/index.html b/spring-web-modules/spring-websockets/src/main/webapp/index.html similarity index 100% rename from spring-websockets/src/main/webapp/index.html rename to spring-web-modules/spring-websockets/src/main/webapp/index.html diff --git a/spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js b/spring-web-modules/spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js similarity index 100% rename from spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js rename to spring-web-modules/spring-websockets/src/main/webapp/resources/js/sockjs-0.3.4.js diff --git a/spring-websockets/src/main/webapp/resources/js/stomp.js b/spring-web-modules/spring-websockets/src/main/webapp/resources/js/stomp.js similarity index 100% rename from spring-websockets/src/main/webapp/resources/js/stomp.js rename to spring-web-modules/spring-websockets/src/main/webapp/resources/js/stomp.js diff --git a/spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js b/spring-web-modules/spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js similarity index 100% rename from spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js rename to spring-web-modules/spring-websockets/src/main/webapp/resources/js/webSocketSendToUserApp.js diff --git a/spring-websockets/src/test/java/com/baeldung/debugwebsockets/WebSocketIntegrationTest.java b/spring-web-modules/spring-websockets/src/test/java/com/baeldung/debugwebsockets/WebSocketIntegrationTest.java similarity index 100% rename from spring-websockets/src/test/java/com/baeldung/debugwebsockets/WebSocketIntegrationTest.java rename to spring-web-modules/spring-websockets/src/test/java/com/baeldung/debugwebsockets/WebSocketIntegrationTest.java