From 1c07f40727bac7e91007cd4e46b62459ad24f1b1 Mon Sep 17 00:00:00 2001 From: mikr Date: Tue, 29 Dec 2020 20:31:13 +0100 Subject: [PATCH] JAVA-3523 Move spring-rest-angular module --- pom.xml | 2 -- spring-web-modules/pom.xml | 1 + .../spring-rest-angular}/README.md | 0 .../spring-rest-angular}/pom.xml | 2 +- .../src/main/java/com/baeldung/web/dao/StudentRepository.java | 0 .../src/main/java/com/baeldung/web/entity/Student.java | 0 .../com/baeldung/web/exception/MyResourceNotFoundException.java | 0 .../src/main/java/com/baeldung/web/main/Application.java | 0 .../src/main/java/com/baeldung/web/main/PersistenceConfig.java | 0 .../com/baeldung/web/rest/StudentDirectoryRestController.java | 0 .../src/main/java/com/baeldung/web/service/IOperations.java | 0 .../src/main/java/com/baeldung/web/service/StudentService.java | 0 .../main/java/com/baeldung/web/service/StudentServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../spring-rest-angular}/src/main/resources/data.sql | 0 .../spring-rest-angular}/src/main/resources/logback.xml | 0 .../spring-rest-angular}/src/main/webapp/WEB-INF/web.xml | 0 .../spring-rest-angular}/src/main/webapp/index.html | 0 .../spring-rest-angular}/src/main/webapp/view/app.js | 0 .../src/test/java/com/baeldung/SpringContextTest.java | 0 .../com/baeldung/web/service/StudentServiceIntegrationTest.java | 0 21 files changed, 2 insertions(+), 3 deletions(-) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/README.md (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/pom.xml (97%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/dao/StudentRepository.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/entity/Student.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/main/Application.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/main/PersistenceConfig.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/rest/StudentDirectoryRestController.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/service/IOperations.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/service/StudentService.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/java/com/baeldung/web/service/StudentServiceImpl.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/resources/application.properties (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/resources/data.sql (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/resources/logback.xml (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/webapp/index.html (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/main/webapp/view/app.js (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-rest-angular => spring-web-modules/spring-rest-angular}/src/test/java/com/baeldung/web/service/StudentServiceIntegrationTest.java (100%) diff --git a/pom.xml b/pom.xml index f8e84c09e1..dbada3d4dd 100644 --- a/pom.xml +++ b/pom.xml @@ -672,7 +672,6 @@ spring-reactor spring-remoting - spring-rest-angular spring-rest-http-2 spring-rest-query-language spring-rest-shell @@ -1142,7 +1141,6 @@ spring-reactor spring-remoting - spring-rest-angular spring-rest-query-language spring-rest-shell spring-rest-simple diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml index 3dea8fc36e..3fc89f7717 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-rest-angular spring-rest-http spring-thymeleaf spring-thymeleaf-2 diff --git a/spring-rest-angular/README.md b/spring-web-modules/spring-rest-angular/README.md similarity index 100% rename from spring-rest-angular/README.md rename to spring-web-modules/spring-rest-angular/README.md diff --git a/spring-rest-angular/pom.xml b/spring-web-modules/spring-rest-angular/pom.xml similarity index 97% rename from spring-rest-angular/pom.xml rename to spring-web-modules/spring-rest-angular/pom.xml index 1d50b4c76c..eb1ec8696c 100644 --- a/spring-rest-angular/pom.xml +++ b/spring-web-modules/spring-rest-angular/pom.xml @@ -11,7 +11,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/dao/StudentRepository.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/dao/StudentRepository.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/dao/StudentRepository.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/dao/StudentRepository.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/entity/Student.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/entity/Student.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/entity/Student.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/entity/Student.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/main/Application.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/main/Application.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/main/Application.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/main/Application.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/main/PersistenceConfig.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/main/PersistenceConfig.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/main/PersistenceConfig.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/main/PersistenceConfig.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/rest/StudentDirectoryRestController.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/rest/StudentDirectoryRestController.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/rest/StudentDirectoryRestController.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/rest/StudentDirectoryRestController.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/service/IOperations.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/IOperations.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/service/IOperations.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/IOperations.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentService.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentService.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/service/StudentService.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentService.java diff --git a/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentServiceImpl.java b/spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentServiceImpl.java similarity index 100% rename from spring-rest-angular/src/main/java/com/baeldung/web/service/StudentServiceImpl.java rename to spring-web-modules/spring-rest-angular/src/main/java/com/baeldung/web/service/StudentServiceImpl.java diff --git a/spring-rest-angular/src/main/resources/application.properties b/spring-web-modules/spring-rest-angular/src/main/resources/application.properties similarity index 100% rename from spring-rest-angular/src/main/resources/application.properties rename to spring-web-modules/spring-rest-angular/src/main/resources/application.properties diff --git a/spring-rest-angular/src/main/resources/data.sql b/spring-web-modules/spring-rest-angular/src/main/resources/data.sql similarity index 100% rename from spring-rest-angular/src/main/resources/data.sql rename to spring-web-modules/spring-rest-angular/src/main/resources/data.sql diff --git a/spring-rest-angular/src/main/resources/logback.xml b/spring-web-modules/spring-rest-angular/src/main/resources/logback.xml similarity index 100% rename from spring-rest-angular/src/main/resources/logback.xml rename to spring-web-modules/spring-rest-angular/src/main/resources/logback.xml diff --git a/spring-rest-angular/src/main/webapp/WEB-INF/web.xml b/spring-web-modules/spring-rest-angular/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-rest-angular/src/main/webapp/WEB-INF/web.xml rename to spring-web-modules/spring-rest-angular/src/main/webapp/WEB-INF/web.xml diff --git a/spring-rest-angular/src/main/webapp/index.html b/spring-web-modules/spring-rest-angular/src/main/webapp/index.html similarity index 100% rename from spring-rest-angular/src/main/webapp/index.html rename to spring-web-modules/spring-rest-angular/src/main/webapp/index.html diff --git a/spring-rest-angular/src/main/webapp/view/app.js b/spring-web-modules/spring-rest-angular/src/main/webapp/view/app.js similarity index 100% rename from spring-rest-angular/src/main/webapp/view/app.js rename to spring-web-modules/spring-rest-angular/src/main/webapp/view/app.js diff --git a/spring-rest-angular/src/test/java/com/baeldung/SpringContextTest.java b/spring-web-modules/spring-rest-angular/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-rest-angular/src/test/java/com/baeldung/SpringContextTest.java rename to spring-web-modules/spring-rest-angular/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-rest-angular/src/test/java/com/baeldung/web/service/StudentServiceIntegrationTest.java b/spring-web-modules/spring-rest-angular/src/test/java/com/baeldung/web/service/StudentServiceIntegrationTest.java similarity index 100% rename from spring-rest-angular/src/test/java/com/baeldung/web/service/StudentServiceIntegrationTest.java rename to spring-web-modules/spring-rest-angular/src/test/java/com/baeldung/web/service/StudentServiceIntegrationTest.java