From 822608eba2458711416097b4e029ded48ce58f24 Mon Sep 17 00:00:00 2001 From: mikr Date: Tue, 28 Jan 2020 22:08:47 +0100 Subject: [PATCH] BAEL-20879 Move Spring Boot Nashorn Module --- pom.xml | 2 -- spring-boot-modules/pom.xml | 1 + .../spring-boot-nashorn}/README.md | 0 .../spring-boot-nashorn}/pom.xml | 2 +- .../src/main/java/com/baeldung/nashorn/Application.java | 0 .../java/com/baeldung/nashorn/controller/MyRestController.java | 0 .../java/com/baeldung/nashorn/controller/MyWebController.java | 0 .../src/main/resources/application.properties | 0 .../spring-boot-nashorn}/src/main/resources/static/app.js | 0 .../src/main/resources/static/js/react-dom-server.js | 0 .../src/main/resources/static/js/react-dom.js | 0 .../spring-boot-nashorn}/src/main/resources/static/js/react.js | 0 .../spring-boot-nashorn}/src/main/webapp/WEB-INF/jsp/index.jsp | 0 13 files changed, 2 insertions(+), 3 deletions(-) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/README.md (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/pom.xml (96%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/java/com/baeldung/nashorn/Application.java (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/java/com/baeldung/nashorn/controller/MyRestController.java (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/java/com/baeldung/nashorn/controller/MyWebController.java (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/resources/application.properties (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/resources/static/app.js (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/resources/static/js/react-dom-server.js (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/resources/static/js/react-dom.js (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/resources/static/js/react.js (100%) rename {spring-boot-nashorn => spring-boot-modules/spring-boot-nashorn}/src/main/webapp/WEB-INF/jsp/index.jsp (100%) diff --git a/pom.xml b/pom.xml index 95a3cb9e72..030646961b 100644 --- a/pom.xml +++ b/pom.xml @@ -661,7 +661,6 @@ spring-boot-libraries spring-boot-logging-log4j2 spring-boot-mvc-2 - spring-boot-nashorn spring-boot-parent spring-boot-performance spring-boot-property-exp @@ -1195,7 +1194,6 @@ spring-boot-logging-log4j2 spring-boot-mvc spring-boot-mvc-2 - spring-boot-nashorn spring-boot-parent spring-boot-performance spring-boot-property-exp diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 490ecb31f9..61986ad957 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -18,6 +18,7 @@ spring-boot-data spring-boot-di spring-boot-mvc-birt + spring-boot-nashorn spring-boot-properties spring-boot-testing spring-boot-vue diff --git a/spring-boot-nashorn/README.md b/spring-boot-modules/spring-boot-nashorn/README.md similarity index 100% rename from spring-boot-nashorn/README.md rename to spring-boot-modules/spring-boot-nashorn/README.md diff --git a/spring-boot-nashorn/pom.xml b/spring-boot-modules/spring-boot-nashorn/pom.xml similarity index 96% rename from spring-boot-nashorn/pom.xml rename to spring-boot-modules/spring-boot-nashorn/pom.xml index af11f14fdc..c60997005d 100644 --- a/spring-boot-nashorn/pom.xml +++ b/spring-boot-modules/spring-boot-nashorn/pom.xml @@ -13,7 +13,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/Application.java b/spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/Application.java similarity index 100% rename from spring-boot-nashorn/src/main/java/com/baeldung/nashorn/Application.java rename to spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/Application.java diff --git a/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyRestController.java b/spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyRestController.java similarity index 100% rename from spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyRestController.java rename to spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyRestController.java diff --git a/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyWebController.java b/spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyWebController.java similarity index 100% rename from spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyWebController.java rename to spring-boot-modules/spring-boot-nashorn/src/main/java/com/baeldung/nashorn/controller/MyWebController.java diff --git a/spring-boot-nashorn/src/main/resources/application.properties b/spring-boot-modules/spring-boot-nashorn/src/main/resources/application.properties similarity index 100% rename from spring-boot-nashorn/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-nashorn/src/main/resources/application.properties diff --git a/spring-boot-nashorn/src/main/resources/static/app.js b/spring-boot-modules/spring-boot-nashorn/src/main/resources/static/app.js similarity index 100% rename from spring-boot-nashorn/src/main/resources/static/app.js rename to spring-boot-modules/spring-boot-nashorn/src/main/resources/static/app.js diff --git a/spring-boot-nashorn/src/main/resources/static/js/react-dom-server.js b/spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react-dom-server.js similarity index 100% rename from spring-boot-nashorn/src/main/resources/static/js/react-dom-server.js rename to spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react-dom-server.js diff --git a/spring-boot-nashorn/src/main/resources/static/js/react-dom.js b/spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react-dom.js similarity index 100% rename from spring-boot-nashorn/src/main/resources/static/js/react-dom.js rename to spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react-dom.js diff --git a/spring-boot-nashorn/src/main/resources/static/js/react.js b/spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react.js similarity index 100% rename from spring-boot-nashorn/src/main/resources/static/js/react.js rename to spring-boot-modules/spring-boot-nashorn/src/main/resources/static/js/react.js diff --git a/spring-boot-nashorn/src/main/webapp/WEB-INF/jsp/index.jsp b/spring-boot-modules/spring-boot-nashorn/src/main/webapp/WEB-INF/jsp/index.jsp similarity index 100% rename from spring-boot-nashorn/src/main/webapp/WEB-INF/jsp/index.jsp rename to spring-boot-modules/spring-boot-nashorn/src/main/webapp/WEB-INF/jsp/index.jsp