From e0ad1261c04fdadcf4490db438324184f4519d89 Mon Sep 17 00:00:00 2001 From: mikr Date: Tue, 29 Dec 2020 22:31:40 +0100 Subject: [PATCH] JAVA-3529 Move spring-mvc-views module --- pom.xml | 2 -- spring-web-modules/pom.xml | 1 + .../spring-mvc-views}/README.md | 0 .../spring-mvc-views}/pom.xml | 2 +- .../main/java/com/baeldung/themes/config/DataSourceConfig.java | 0 .../src/main/java/com/baeldung/themes/config/InitSecurity.java | 0 .../main/java/com/baeldung/themes/config/SecurityConfig.java | 0 .../main/java/com/baeldung/themes/config/ThemeMVCConfig.java | 0 .../baeldung/themes/config/TilesApplicationConfiguration.java | 0 .../main/java/com/baeldung/themes/config/WebInitializer.java | 0 .../java/com/baeldung/themes/controllers/AppController.java | 0 .../java/com/baeldung/themes/controllers/TilesController.java | 0 .../main/java/com/baeldung/themes/domain/UserPreference.java | 0 .../baeldung/themes/repository/UserPreferenceRepository.java | 0 .../baeldung/themes/resolver/UserPreferenceThemeResolver.java | 0 .../spring-mvc-views}/src/main/resources/dark.properties | 0 .../spring-mvc-views}/src/main/resources/dark_en_US.properties | 0 .../spring-mvc-views}/src/main/resources/db/sql/create-db.sql | 0 .../spring-mvc-views}/src/main/resources/db/sql/insert-data.sql | 0 .../spring-mvc-views}/src/main/resources/light.properties | 0 .../spring-mvc-views}/src/main/resources/light_en_US.properties | 0 .../spring-mvc-views}/src/main/resources/themes/black.css | 0 .../spring-mvc-views}/src/main/resources/themes/white.css | 0 .../spring-mvc-views}/src/main/webapp/WEB-INF/index.jsp | 0 .../src/main/webapp/WEB-INF/views/pages/apachetiles.jsp | 0 .../src/main/webapp/WEB-INF/views/pages/home.jsp | 0 .../src/main/webapp/WEB-INF/views/pages/springmvc.jsp | 0 .../main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp | 0 .../main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp | 0 .../main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp | 0 .../main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp | 0 .../src/main/webapp/WEB-INF/views/tiles/tiles.xml | 0 .../spring-mvc-views}/src/main/webapp/static/css/app.css | 0 33 files changed, 2 insertions(+), 3 deletions(-) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/README.md (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/pom.xml (98%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/DataSourceConfig.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/InitSecurity.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/SecurityConfig.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/TilesApplicationConfiguration.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/config/WebInitializer.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/controllers/AppController.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/controllers/TilesController.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/domain/UserPreference.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/java/com/baeldung/themes/resolver/UserPreferenceThemeResolver.java (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/dark.properties (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/dark_en_US.properties (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/db/sql/create-db.sql (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/db/sql/insert-data.sql (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/light.properties (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/light_en_US.properties (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/themes/black.css (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/resources/themes/white.css (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/index.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/pages/home.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/pages/springmvc.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/WEB-INF/views/tiles/tiles.xml (100%) rename {spring-mvc-views => spring-web-modules/spring-mvc-views}/src/main/webapp/static/css/app.css (100%) diff --git a/pom.xml b/pom.xml index f8e84c09e1..3e360b58cc 100644 --- a/pom.xml +++ b/pom.xml @@ -663,7 +663,6 @@ spring-mvc-java-2 spring-mvc-velocity - spring-mvc-views spring-mvc-webflow spring-mvc-xml @@ -1133,7 +1132,6 @@ spring-mvc-java-2 spring-mvc-velocity - spring-mvc-views spring-mvc-webflow spring-mvc-xml diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index 3dea8fc36e..1da3612493 100644 --- a/spring-web-modules/pom.xml +++ b/spring-web-modules/pom.xml @@ -20,6 +20,7 @@ spring-mvc-basics-4 spring-mvc-crash spring-mvc-forms-jsp + spring-mvc-views spring-rest-http spring-thymeleaf spring-thymeleaf-2 diff --git a/spring-mvc-views/README.md b/spring-web-modules/spring-mvc-views/README.md similarity index 100% rename from spring-mvc-views/README.md rename to spring-web-modules/spring-mvc-views/README.md diff --git a/spring-mvc-views/pom.xml b/spring-web-modules/spring-mvc-views/pom.xml similarity index 98% rename from spring-mvc-views/pom.xml rename to spring-web-modules/spring-mvc-views/pom.xml index 452805bd53..2c3be5a33e 100644 --- a/spring-mvc-views/pom.xml +++ b/spring-web-modules/spring-mvc-views/pom.xml @@ -11,7 +11,7 @@ com.baeldung parent-spring-5 0.0.1-SNAPSHOT - ../parent-spring-5 + parent-spring-5/pom.xml diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/DataSourceConfig.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/DataSourceConfig.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/DataSourceConfig.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/DataSourceConfig.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/InitSecurity.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/InitSecurity.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/InitSecurity.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/InitSecurity.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/SecurityConfig.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/SecurityConfig.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/SecurityConfig.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/SecurityConfig.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/ThemeMVCConfig.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/TilesApplicationConfiguration.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/TilesApplicationConfiguration.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/TilesApplicationConfiguration.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/TilesApplicationConfiguration.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/config/WebInitializer.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/WebInitializer.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/config/WebInitializer.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/config/WebInitializer.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/AppController.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/AppController.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/controllers/AppController.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/AppController.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/TilesController.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/TilesController.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/controllers/TilesController.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/controllers/TilesController.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/domain/UserPreference.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/domain/UserPreference.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/domain/UserPreference.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/domain/UserPreference.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/repository/UserPreferenceRepository.java diff --git a/spring-mvc-views/src/main/java/com/baeldung/themes/resolver/UserPreferenceThemeResolver.java b/spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/resolver/UserPreferenceThemeResolver.java similarity index 100% rename from spring-mvc-views/src/main/java/com/baeldung/themes/resolver/UserPreferenceThemeResolver.java rename to spring-web-modules/spring-mvc-views/src/main/java/com/baeldung/themes/resolver/UserPreferenceThemeResolver.java diff --git a/spring-mvc-views/src/main/resources/dark.properties b/spring-web-modules/spring-mvc-views/src/main/resources/dark.properties similarity index 100% rename from spring-mvc-views/src/main/resources/dark.properties rename to spring-web-modules/spring-mvc-views/src/main/resources/dark.properties diff --git a/spring-mvc-views/src/main/resources/dark_en_US.properties b/spring-web-modules/spring-mvc-views/src/main/resources/dark_en_US.properties similarity index 100% rename from spring-mvc-views/src/main/resources/dark_en_US.properties rename to spring-web-modules/spring-mvc-views/src/main/resources/dark_en_US.properties diff --git a/spring-mvc-views/src/main/resources/db/sql/create-db.sql b/spring-web-modules/spring-mvc-views/src/main/resources/db/sql/create-db.sql similarity index 100% rename from spring-mvc-views/src/main/resources/db/sql/create-db.sql rename to spring-web-modules/spring-mvc-views/src/main/resources/db/sql/create-db.sql diff --git a/spring-mvc-views/src/main/resources/db/sql/insert-data.sql b/spring-web-modules/spring-mvc-views/src/main/resources/db/sql/insert-data.sql similarity index 100% rename from spring-mvc-views/src/main/resources/db/sql/insert-data.sql rename to spring-web-modules/spring-mvc-views/src/main/resources/db/sql/insert-data.sql diff --git a/spring-mvc-views/src/main/resources/light.properties b/spring-web-modules/spring-mvc-views/src/main/resources/light.properties similarity index 100% rename from spring-mvc-views/src/main/resources/light.properties rename to spring-web-modules/spring-mvc-views/src/main/resources/light.properties diff --git a/spring-mvc-views/src/main/resources/light_en_US.properties b/spring-web-modules/spring-mvc-views/src/main/resources/light_en_US.properties similarity index 100% rename from spring-mvc-views/src/main/resources/light_en_US.properties rename to spring-web-modules/spring-mvc-views/src/main/resources/light_en_US.properties diff --git a/spring-mvc-views/src/main/resources/themes/black.css b/spring-web-modules/spring-mvc-views/src/main/resources/themes/black.css similarity index 100% rename from spring-mvc-views/src/main/resources/themes/black.css rename to spring-web-modules/spring-mvc-views/src/main/resources/themes/black.css diff --git a/spring-mvc-views/src/main/resources/themes/white.css b/spring-web-modules/spring-mvc-views/src/main/resources/themes/white.css similarity index 100% rename from spring-mvc-views/src/main/resources/themes/white.css rename to spring-web-modules/spring-mvc-views/src/main/resources/themes/white.css diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/index.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/index.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/index.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/index.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/apachetiles.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/home.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/home.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/pages/home.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/home.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/springmvc.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/springmvc.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/pages/springmvc.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/pages/springmvc.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/layouts/defaultLayout.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultFooter.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultHeader.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/templates/defaultMenu.jsp diff --git a/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/tiles.xml b/spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/tiles.xml similarity index 100% rename from spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/tiles.xml rename to spring-web-modules/spring-mvc-views/src/main/webapp/WEB-INF/views/tiles/tiles.xml diff --git a/spring-mvc-views/src/main/webapp/static/css/app.css b/spring-web-modules/spring-mvc-views/src/main/webapp/static/css/app.css similarity index 100% rename from spring-mvc-views/src/main/webapp/static/css/app.css rename to spring-web-modules/spring-mvc-views/src/main/webapp/static/css/app.css