From 23473c29706f45dbdb12207cb1b9df17285b24ed Mon Sep 17 00:00:00 2001
From: mikr <michael.krimgen@ximedes.com>
Date: Sun, 26 Jan 2020 17:06:40 +0100
Subject: [PATCH] BAEL-20877 Move Spring Boot MVC Birt

---
 pom.xml                                                       | 2 --
 spring-boot-modules/pom.xml                                   | 4 ++++
 .../spring-boot-mvc-birt}/README.md                           | 0
 .../spring-boot-mvc-birt}/pom.xml                             | 2 +-
 .../spring-boot-mvc-birt}/reports/csv_data_report.rptdesign   | 0
 .../spring-boot-mvc-birt}/reports/data.csv                    | 0
 .../spring-boot-mvc-birt}/reports/static_report.rptdesign     | 0
 .../com/baeldung/birt/designer/ReportDesignApplication.java   | 0
 .../com/baeldung/birt/engine/ReportEngineApplication.java     | 0
 .../baeldung/birt/engine/controller/BirtReportController.java | 0
 .../main/java/com/baeldung/birt/engine/dto/OutputType.java    | 0
 .../src/main/java/com/baeldung/birt/engine/dto/Report.java    | 0
 .../com/baeldung/birt/engine/service/BirtReportService.java   | 0
 .../src/main/resources/application.properties                 | 0
 14 files changed, 5 insertions(+), 3 deletions(-)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/README.md (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/pom.xml (98%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/csv_data_report.rptdesign (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/data.csv (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/reports/static_report.rptdesign (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/dto/OutputType.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/dto/Report.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java (100%)
 rename {spring-boot-mvc-birt => spring-boot-modules/spring-boot-mvc-birt}/src/main/resources/application.properties (100%)

diff --git a/pom.xml b/pom.xml
index 4d04617dcc..0ac4ab3d51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -663,7 +663,6 @@
                 <module>spring-boot-libraries</module>
                 <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc-2</module>
-                <module>spring-boot-mvc-birt</module>
                 <module>spring-boot-nashorn</module>
                 <module>spring-boot-parent</module>
                 <module>spring-boot-performance</module>
@@ -1203,7 +1202,6 @@
                 <module>spring-boot-logging-log4j2</module>
                 <module>spring-boot-mvc</module>
                 <module>spring-boot-mvc-2</module>
-                <module>spring-boot-mvc-birt</module>
                 <module>spring-boot-nashorn</module>
                 <module>spring-boot-parent</module>
                 <module>spring-boot-performance</module>
diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index b4f8328386..7920154d62 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -13,4 +13,8 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <modules>
+        <module>spring-boot-mvc-birt</module>
+    </modules>
+
 </project>
diff --git a/spring-boot-mvc-birt/README.md b/spring-boot-modules/spring-boot-mvc-birt/README.md
similarity index 100%
rename from spring-boot-mvc-birt/README.md
rename to spring-boot-modules/spring-boot-mvc-birt/README.md
diff --git a/spring-boot-mvc-birt/pom.xml b/spring-boot-modules/spring-boot-mvc-birt/pom.xml
similarity index 98%
rename from spring-boot-mvc-birt/pom.xml
rename to spring-boot-modules/spring-boot-mvc-birt/pom.xml
index 76760e661b..f65b851f30 100644
--- a/spring-boot-mvc-birt/pom.xml
+++ b/spring-boot-modules/spring-boot-mvc-birt/pom.xml
@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-boot-mvc-birt/reports/csv_data_report.rptdesign b/spring-boot-modules/spring-boot-mvc-birt/reports/csv_data_report.rptdesign
similarity index 100%
rename from spring-boot-mvc-birt/reports/csv_data_report.rptdesign
rename to spring-boot-modules/spring-boot-mvc-birt/reports/csv_data_report.rptdesign
diff --git a/spring-boot-mvc-birt/reports/data.csv b/spring-boot-modules/spring-boot-mvc-birt/reports/data.csv
similarity index 100%
rename from spring-boot-mvc-birt/reports/data.csv
rename to spring-boot-modules/spring-boot-mvc-birt/reports/data.csv
diff --git a/spring-boot-mvc-birt/reports/static_report.rptdesign b/spring-boot-modules/spring-boot-mvc-birt/reports/static_report.rptdesign
similarity index 100%
rename from spring-boot-mvc-birt/reports/static_report.rptdesign
rename to spring-boot-modules/spring-boot-mvc-birt/reports/static_report.rptdesign
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/designer/ReportDesignApplication.java
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/ReportEngineApplication.java
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/controller/BirtReportController.java
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/OutputType.java
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/dto/Report.java
diff --git a/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java b/spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java
similarity index 100%
rename from spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/java/com/baeldung/birt/engine/service/BirtReportService.java
diff --git a/spring-boot-mvc-birt/src/main/resources/application.properties b/spring-boot-modules/spring-boot-mvc-birt/src/main/resources/application.properties
similarity index 100%
rename from spring-boot-mvc-birt/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-mvc-birt/src/main/resources/application.properties