Updated project structure to use 'subprojects' directory.

cosmincloud · Apr 1, 2019 · 7479730 · 7479730
1 parent 804fd23
commit 7479730
Show file tree

Hide file tree

Showing 81 changed files with 29 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,5 +30,5 @@
 /.data/
 
 # Generated resources
-/checklister-web/src/main/resources/checklister-build.properties
-/checklister-web/src/main/resources/banner.txt
+/subprojects/web/src/main/resources/checklister-build.properties
+/subprojects/web/src/main/resources/banner.txt
diff --git a/checklister-web/src/main/resources/checklister-build.properties b/checklister-web/src/main/resources/checklister-build.properties
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,16 @@
 rootProject.name = "checklister"
-include("checklister-dto",
-        "checklister-event",
-        "checklister-eventserde-json",
-        "checklister-eventsink-logger",
-        "checklister-eventsink-kafka",
-        "checklister-web")
+
+include("dto",
+        "event",
+        "eventserde-json",
+        "eventsink-logger",
+        "eventsink-kafka",
+        "web",
+        "history")
+
+for (project in rootProject.children) {
+    project.apply {
+        projectDir = file("subprojects/$name")
+        buildFileName = "$name.gradle.kts"
+    }
+}
diff --git a/checklister-dto/build.gradle.kts → subprojects/dto/dto.gradle.kts b/checklister-dto/build.gradle.kts → subprojects/dto/dto.gradle.kts
diff --git a/...ud/cosmin/checklister/lib/dto/EventDto.kt → ...ud/cosmin/checklister/lib/dto/EventDto.kt b/...ud/cosmin/checklister/lib/dto/EventDto.kt → ...ud/cosmin/checklister/lib/dto/EventDto.kt
diff --git a/.../cosmin/checklister/lib/dto/ItemGetDto.kt → .../cosmin/checklister/lib/dto/ItemGetDto.kt b/.../cosmin/checklister/lib/dto/ItemGetDto.kt → .../cosmin/checklister/lib/dto/ItemGetDto.kt
diff --git a/...cosmin/checklister/lib/dto/ItemPostDto.kt → ...cosmin/checklister/lib/dto/ItemPostDto.kt b/...cosmin/checklister/lib/dto/ItemPostDto.kt → ...cosmin/checklister/lib/dto/ItemPostDto.kt
diff --git a/.../cosmin/checklister/lib/dto/ListGetDto.kt → .../cosmin/checklister/lib/dto/ListGetDto.kt b/.../cosmin/checklister/lib/dto/ListGetDto.kt → .../cosmin/checklister/lib/dto/ListGetDto.kt
diff --git a/...cosmin/checklister/lib/dto/ListPostDto.kt → ...cosmin/checklister/lib/dto/ListPostDto.kt b/...cosmin/checklister/lib/dto/ListPostDto.kt → ...cosmin/checklister/lib/dto/ListPostDto.kt
diff --git a/...n/checklister/lib/dto/ListWithItemsDto.kt → ...n/checklister/lib/dto/ListWithItemsDto.kt b/...n/checklister/lib/dto/ListWithItemsDto.kt → ...n/checklister/lib/dto/ListWithItemsDto.kt
diff --git a/...ud/cosmin/checklister/lib/dto/Mappable.kt → ...ud/cosmin/checklister/lib/dto/Mappable.kt b/...ud/cosmin/checklister/lib/dto/Mappable.kt → ...ud/cosmin/checklister/lib/dto/Mappable.kt
diff --git a/...n/checklister/lib/dto/ParsingFunctions.kt → ...n/checklister/lib/dto/ParsingFunctions.kt b/...n/checklister/lib/dto/ParsingFunctions.kt → ...n/checklister/lib/dto/ParsingFunctions.kt
diff --git a/...min/checklister/lib/dto/ItemGetDtoTest.kt → ...min/checklister/lib/dto/ItemGetDtoTest.kt b/...min/checklister/lib/dto/ItemGetDtoTest.kt → ...min/checklister/lib/dto/ItemGetDtoTest.kt
diff --git a/...in/checklister/lib/dto/ItemPostDtoTest.kt → ...in/checklister/lib/dto/ItemPostDtoTest.kt b/...in/checklister/lib/dto/ItemPostDtoTest.kt → ...in/checklister/lib/dto/ItemPostDtoTest.kt
diff --git a/...min/checklister/lib/dto/ListGetDtoTest.kt → ...min/checklister/lib/dto/ListGetDtoTest.kt b/...min/checklister/lib/dto/ListGetDtoTest.kt → ...min/checklister/lib/dto/ListGetDtoTest.kt
diff --git a/checklister-event/build.gradle.kts → subprojects/event/event.gradle.kts b/checklister-event/build.gradle.kts → subprojects/event/event.gradle.kts
@@ -10,5 +10,5 @@ repositories {
 dependencies {
     // Kotlin
     implementation(kotlin("stdlib-jdk8"))
-    implementation(project(":checklister-dto"))
+    implementation(project(":dto"))
 }
diff --git a/...oud/cosmin/checklister/lib/event/Event.kt → ...oud/cosmin/checklister/lib/event/Event.kt b/...oud/cosmin/checklister/lib/event/Event.kt → ...oud/cosmin/checklister/lib/event/Event.kt
diff --git a/...osmin/checklister/lib/event/ItemEvents.kt → ...osmin/checklister/lib/event/ItemEvents.kt b/...osmin/checklister/lib/event/ItemEvents.kt → ...osmin/checklister/lib/event/ItemEvents.kt
diff --git a/...osmin/checklister/lib/event/ListEvents.kt → ...osmin/checklister/lib/event/ListEvents.kt b/...osmin/checklister/lib/event/ListEvents.kt → ...osmin/checklister/lib/event/ListEvents.kt
diff --git a/...cklister/lib/event/model/RankOperation.kt → ...cklister/lib/event/model/RankOperation.kt b/...cklister/lib/event/model/RankOperation.kt → ...cklister/lib/event/model/RankOperation.kt
diff --git a/...ster/lib/event/serde/EventDeserializer.kt → ...ster/lib/event/serde/EventDeserializer.kt b/...ster/lib/event/serde/EventDeserializer.kt → ...ster/lib/event/serde/EventDeserializer.kt
diff --git a/...lister/lib/event/serde/EventSerializer.kt → ...lister/lib/event/serde/EventSerializer.kt b/...lister/lib/event/serde/EventSerializer.kt → ...lister/lib/event/serde/EventSerializer.kt
diff --git a/...ib/event/serde/ToStringEventSerializer.kt → ...ib/event/serde/ToStringEventSerializer.kt b/...ib/event/serde/ToStringEventSerializer.kt → ...ib/event/serde/ToStringEventSerializer.kt
diff --git a/...n/checklister/lib/event/sink/EventSink.kt → ...n/checklister/lib/event/sink/EventSink.kt b/...n/checklister/lib/event/sink/EventSink.kt → ...n/checklister/lib/event/sink/EventSink.kt
diff --git a/checklister-eventserde-json/build.gradle.kts → ...ventserde-json/eventserde-json.gradle.kts b/checklister-eventserde-json/build.gradle.kts → ...ventserde-json/eventserde-json.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.3.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.3.2")
 
-    implementation(project(":checklister-event"))
-    testImplementation(project(":checklister-dto"))
+    implementation(project(":event"))
+    testImplementation(project(":dto"))
 }
diff --git a/...ter/lib/eventserde/json/JsonEventSerde.kt → ...ter/lib/eventserde/json/JsonEventSerde.kt b/...ter/lib/eventserde/json/JsonEventSerde.kt → ...ter/lib/eventserde/json/JsonEventSerde.kt
diff --git a/...lib/eventserde/json/JsonEventSerdeTest.kt → ...lib/eventserde/json/JsonEventSerdeTest.kt b/...lib/eventserde/json/JsonEventSerdeTest.kt → ...lib/eventserde/json/JsonEventSerdeTest.kt
diff --git a/checklister-eventsink-kafka/build.gradle.kts → ...ventsink-kafka/eventsink-kafka.gradle.kts b/checklister-eventsink-kafka/build.gradle.kts → ...ventsink-kafka/eventsink-kafka.gradle.kts
@@ -34,9 +34,9 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
 
     // Checklister dependencies
-    implementation(project(":checklister-dto"))
-    implementation(project(":checklister-event"))
-    testImplementation(project(":checklister-eventserde-json"))
+    implementation(project(":dto"))
+    implementation(project(":event"))
+    testImplementation(project(":eventserde-json"))
 
     // log4j2
     implementation("org.apache.logging.log4j:log4j-api:2.11.2")

diff --git a/...lib/eventsink/kafka/KafkaEventSinkTest.kt → ...lib/eventsink/kafka/KafkaEventSinkTest.kt b/...lib/eventsink/kafka/KafkaEventSinkTest.kt → ...lib/eventsink/kafka/KafkaEventSinkTest.kt
diff --git a/...ter/lib/eventsink/kafka/KafkaEventSink.kt → ...ter/lib/eventsink/kafka/KafkaEventSink.kt b/...ter/lib/eventsink/kafka/KafkaEventSink.kt → ...ter/lib/eventsink/kafka/KafkaEventSink.kt
diff --git a/...klister-eventsink-logger/build.gradle.kts → ...ntsink-logger/eventsink-logger.gradle.kts b/...klister-eventsink-logger/build.gradle.kts → ...ntsink-logger/eventsink-logger.gradle.kts
@@ -10,5 +10,5 @@ repositories {
 dependencies {
     api("org.apache.logging.log4j:log4j-api:2.11.2")
     implementation(kotlin("stdlib-jdk8")) // Kotlin stdlib
-    implementation(project(":checklister-event"))
+    implementation(project(":event"))
 }
diff --git a/...r/lib/eventsink/logger/LoggerEventSink.kt → ...r/lib/eventsink/logger/LoggerEventSink.kt b/...r/lib/eventsink/logger/LoggerEventSink.kt → ...r/lib/eventsink/logger/LoggerEventSink.kt
diff --git a/...kotlin/cloud/cosmin/checklister/BaseIT.kt → ...kotlin/cloud/cosmin/checklister/BaseIT.kt b/...kotlin/cloud/cosmin/checklister/BaseIT.kt → ...kotlin/cloud/cosmin/checklister/BaseIT.kt
diff --git a/.../cloud/cosmin/checklister/ItemUpdateIT.kt → .../cloud/cosmin/checklister/ItemUpdateIT.kt b/.../cloud/cosmin/checklister/ItemUpdateIT.kt → .../cloud/cosmin/checklister/ItemUpdateIT.kt
diff --git a/...loud/cosmin/checklister/ListCreationIT.kt → ...loud/cosmin/checklister/ListCreationIT.kt b/...loud/cosmin/checklister/ListCreationIT.kt → ...loud/cosmin/checklister/ListCreationIT.kt
diff --git a/.../cloud/cosmin/checklister/ListUpdateIT.kt → .../cloud/cosmin/checklister/ListUpdateIT.kt b/.../cloud/cosmin/checklister/ListUpdateIT.kt → .../cloud/cosmin/checklister/ListUpdateIT.kt
diff --git a/...lin/cloud/cosmin/checklister/LoginTest.kt → ...lin/cloud/cosmin/checklister/LoginTest.kt b/...lin/cloud/cosmin/checklister/LoginTest.kt → ...lin/cloud/cosmin/checklister/LoginTest.kt
diff --git a/...d/cosmin/checklister/discovery/Service.kt → ...d/cosmin/checklister/discovery/Service.kt b/...d/cosmin/checklister/discovery/Service.kt → ...d/cosmin/checklister/discovery/Service.kt
diff --git a/...checklister/discovery/ServiceDiscovery.kt → ...checklister/discovery/ServiceDiscovery.kt b/...checklister/discovery/ServiceDiscovery.kt → ...checklister/discovery/ServiceDiscovery.kt
diff --git a/...min/checklister/ChecklisterApplication.kt → ...min/checklister/ChecklisterApplication.kt b/...min/checklister/ChecklisterApplication.kt → ...min/checklister/ChecklisterApplication.kt
diff --git a/.../cosmin/checklister/config/EventConfig.kt → .../cosmin/checklister/config/EventConfig.kt b/.../cosmin/checklister/config/EventConfig.kt → .../cosmin/checklister/config/EventConfig.kt
diff --git a/.../cosmin/checklister/config/KafkaConfig.kt → .../cosmin/checklister/config/KafkaConfig.kt b/.../cosmin/checklister/config/KafkaConfig.kt → .../cosmin/checklister/config/KafkaConfig.kt
diff --git a/...osmin/checklister/config/SwaggerConfig.kt → ...osmin/checklister/config/SwaggerConfig.kt b/...osmin/checklister/config/SwaggerConfig.kt → ...osmin/checklister/config/SwaggerConfig.kt
diff --git a/...oud/cosmin/checklister/dao/EventEntity.kt → ...oud/cosmin/checklister/dao/EventEntity.kt b/...oud/cosmin/checklister/dao/EventEntity.kt → ...oud/cosmin/checklister/dao/EventEntity.kt
diff --git a/...loud/cosmin/checklister/dao/ItemEntity.kt → ...loud/cosmin/checklister/dao/ItemEntity.kt b/...loud/cosmin/checklister/dao/ItemEntity.kt → ...loud/cosmin/checklister/dao/ItemEntity.kt
diff --git a/...loud/cosmin/checklister/dao/ListEntity.kt → ...loud/cosmin/checklister/dao/ListEntity.kt b/...loud/cosmin/checklister/dao/ListEntity.kt → ...loud/cosmin/checklister/dao/ListEntity.kt
diff --git a/...loud/cosmin/checklister/repo/EventRepo.kt → ...loud/cosmin/checklister/repo/EventRepo.kt b/...loud/cosmin/checklister/repo/EventRepo.kt → ...loud/cosmin/checklister/repo/EventRepo.kt
diff --git a/...cloud/cosmin/checklister/repo/ItemRepo.kt → ...cloud/cosmin/checklister/repo/ItemRepo.kt b/...cloud/cosmin/checklister/repo/ItemRepo.kt → ...cloud/cosmin/checklister/repo/ItemRepo.kt
diff --git a/...cloud/cosmin/checklister/repo/ListRepo.kt → ...cloud/cosmin/checklister/repo/ListRepo.kt b/...cloud/cosmin/checklister/repo/ListRepo.kt → ...cloud/cosmin/checklister/repo/ListRepo.kt
diff --git a/...osmin/checklister/rest/EventController.kt → ...osmin/checklister/rest/EventController.kt b/...osmin/checklister/rest/EventController.kt → ...osmin/checklister/rest/EventController.kt
diff --git a/...osmin/checklister/rest/IndexController.kt → ...osmin/checklister/rest/IndexController.kt b/...osmin/checklister/rest/IndexController.kt → ...osmin/checklister/rest/IndexController.kt
diff --git a/...cosmin/checklister/rest/ItemController.kt → ...cosmin/checklister/rest/ItemController.kt b/...cosmin/checklister/rest/ItemController.kt → ...cosmin/checklister/rest/ItemController.kt
diff --git a/...cosmin/checklister/rest/ListController.kt → ...cosmin/checklister/rest/ListController.kt b/...cosmin/checklister/rest/ListController.kt → ...cosmin/checklister/rest/ListController.kt
diff --git a/...checklister/service/BuildConfigService.kt → ...checklister/service/BuildConfigService.kt b/...checklister/service/BuildConfigService.kt → ...checklister/service/BuildConfigService.kt
diff --git a/...n/checklister/service/ConverterService.kt → ...n/checklister/service/ConverterService.kt b/...n/checklister/service/ConverterService.kt → ...n/checklister/service/ConverterService.kt
diff --git a/...cosmin/checklister/service/ItemService.kt → ...cosmin/checklister/service/ItemService.kt b/...cosmin/checklister/service/ItemService.kt → ...cosmin/checklister/service/ItemService.kt
diff --git a/...cosmin/checklister/service/ListService.kt → ...cosmin/checklister/service/ListService.kt b/...cosmin/checklister/service/ListService.kt → ...cosmin/checklister/service/ListService.kt
diff --git a/...cosmin/checklister/service/UuidService.kt → ...cosmin/checklister/service/UuidService.kt b/...cosmin/checklister/service/UuidService.kt → ...cosmin/checklister/service/UuidService.kt
diff --git a/...checklister/service/event/EventService.kt → ...checklister/service/event/EventService.kt b/...checklister/service/event/EventService.kt → ...checklister/service/event/EventService.kt
diff --git a/...klister/service/event/ItemEventService.kt → ...klister/service/event/ItemEventService.kt b/...klister/service/event/ItemEventService.kt → ...klister/service/event/ItemEventService.kt
diff --git a/...klister/service/event/ListEventService.kt → ...klister/service/event/ListEventService.kt b/...klister/service/event/ListEventService.kt → ...klister/service/event/ListEventService.kt
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...ion/postgresql/V1_0__Initial_Database.sql → ...ion/postgresql/V1_0__Initial_Database.sql b/...ion/postgresql/V1_0__Initial_Database.sql → ...ion/postgresql/V1_0__Initial_Database.sql
diff --git a/...gresql/V1_1__Add_content_type_to_item.sql → ...gresql/V1_1__Add_content_type_to_item.sql b/...gresql/V1_1__Add_content_type_to_item.sql → ...gresql/V1_1__Add_content_type_to_item.sql
diff --git a/...sql/V1_2__Drop_unique_rank_constraint.sql → ...sql/V1_2__Drop_unique_rank_constraint.sql b/...sql/V1_2__Drop_unique_rank_constraint.sql → ...sql/V1_2__Drop_unique_rank_constraint.sql
diff --git a/...ation/postgresql/V1_3__Rank_functions.sql → ...ation/postgresql/V1_3__Rank_functions.sql b/...ation/postgresql/V1_3__Rank_functions.sql → ...ation/postgresql/V1_3__Rank_functions.sql
diff --git a/.../db/migration/postgresql/V1_4__events.sql → .../db/migration/postgresql/V1_4__events.sql b/.../db/migration/postgresql/V1_4__events.sql → .../db/migration/postgresql/V1_4__events.sql
diff --git a/...klister-web/src/main/resources/log4j2.xml → ...rojects/web/src/main/resources/log4j2.xml b/...klister-web/src/main/resources/log4j2.xml → ...rojects/web/src/main/resources/log4j2.xml
diff --git a/...cosmin/checklister/dao/EventEntityTest.kt → ...cosmin/checklister/dao/EventEntityTest.kt b/...cosmin/checklister/dao/EventEntityTest.kt → ...cosmin/checklister/dao/EventEntityTest.kt
diff --git a/...cosmin/checklister/dto/ListPostDtoTest.kt → ...cosmin/checklister/dto/ListPostDtoTest.kt b/...cosmin/checklister/dto/ListPostDtoTest.kt → ...cosmin/checklister/dto/ListPostDtoTest.kt
diff --git a/...d/cosmin/checklister/repo/ItemRepoTest.kt → ...d/cosmin/checklister/repo/ItemRepoTest.kt b/...d/cosmin/checklister/repo/ItemRepoTest.kt → ...d/cosmin/checklister/repo/ItemRepoTest.kt
diff --git a/...d/cosmin/checklister/repo/ListRepoTest.kt → ...d/cosmin/checklister/repo/ListRepoTest.kt b/...d/cosmin/checklister/repo/ListRepoTest.kt → ...d/cosmin/checklister/repo/ListRepoTest.kt
diff --git a/...n/checklister/rest/IndexControllerTest.kt → ...n/checklister/rest/IndexControllerTest.kt b/...n/checklister/rest/IndexControllerTest.kt → ...n/checklister/rest/IndexControllerTest.kt
diff --git a/...in/checklister/rest/ListControllerTest.kt → ...in/checklister/rest/ListControllerTest.kt b/...in/checklister/rest/ListControllerTest.kt → ...in/checklister/rest/ListControllerTest.kt
diff --git a/...ecklister/service/ConverterServiceTest.kt → ...ecklister/service/ConverterServiceTest.kt b/...ecklister/service/ConverterServiceTest.kt → ...ecklister/service/ConverterServiceTest.kt
diff --git a/...in/checklister/service/ItemServiceTest.kt → ...in/checklister/service/ItemServiceTest.kt b/...in/checklister/service/ItemServiceTest.kt → ...in/checklister/service/ItemServiceTest.kt
diff --git a/...in/checklister/service/ListServiceTest.kt → ...in/checklister/service/ListServiceTest.kt b/...in/checklister/service/ListServiceTest.kt → ...in/checklister/service/ListServiceTest.kt
diff --git a/...in/checklister/service/UuidServiceTest.kt → ...in/checklister/service/UuidServiceTest.kt b/...in/checklister/service/UuidServiceTest.kt → ...in/checklister/service/UuidServiceTest.kt
diff --git a/...ter/service/event/ItemEventServiceTest.kt → ...ter/service/event/ItemEventServiceTest.kt b/...ter/service/event/ItemEventServiceTest.kt → ...ter/service/event/ItemEventServiceTest.kt
diff --git a/...-extensions/org.mockito.plugins.MockMaker → ...-extensions/org.mockito.plugins.MockMaker b/...-extensions/org.mockito.plugins.MockMaker → ...-extensions/org.mockito.plugins.MockMaker
diff --git a/checklister-web/build.gradle.kts → subprojects/web/web.gradle.kts b/checklister-web/build.gradle.kts → subprojects/web/web.gradle.kts
@@ -186,9 +186,9 @@ dependencies {
 //    integrationTestCompile("org.seleniumhq.selenium:selenium-java:3.13.0")
 //    integrationTestCompile("org.seleniumhq.selenium:selenium-remote-driver:3.13.0")
 
-    implementation(project(":checklister-event"))
-    implementation(project(":checklister-dto"))
-    implementation(project(":checklister-eventserde-json"))
-    implementation(project(":checklister-eventsink-kafka"))
-    implementation(project(":checklister-eventsink-logger"))
+    implementation(project(":event"))
+    implementation(project(":dto"))
+    implementation(project(":eventserde-json"))
+    implementation(project(":eventsink-kafka"))
+    implementation(project(":eventsink-logger"))
 }