diff --git a/.gitignore b/.gitignore index dba3f17..04fd74b 100644 --- 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 deleted file mode 100644 index 6b851ff..0000000 --- a/checklister-web/src/main/resources/checklister-build.properties +++ /dev/null @@ -1 +0,0 @@ -version=0.1.2-SNAPSHOT diff --git a/settings.gradle.kts b/settings.gradle.kts index 744405e..ec359a4 100644 --- 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" + } +} \ No newline at end of file diff --git a/checklister-dto/build.gradle.kts b/subprojects/dto/dto.gradle.kts similarity index 100% rename from checklister-dto/build.gradle.kts rename to subprojects/dto/dto.gradle.kts diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/EventDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/EventDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/EventDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/EventDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListPostDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListPostDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListPostDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListPostDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListWithItemsDto.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListWithItemsDto.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListWithItemsDto.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ListWithItemsDto.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/Mappable.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/Mappable.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/Mappable.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/Mappable.kt diff --git a/checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ParsingFunctions.kt b/subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ParsingFunctions.kt similarity index 100% rename from checklister-dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ParsingFunctions.kt rename to subprojects/dto/src/main/kotlin/cloud/cosmin/checklister/lib/dto/ParsingFunctions.kt diff --git a/checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDtoTest.kt b/subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDtoTest.kt similarity index 100% rename from checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDtoTest.kt rename to subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemGetDtoTest.kt diff --git a/checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDtoTest.kt b/subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDtoTest.kt similarity index 100% rename from checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDtoTest.kt rename to subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ItemPostDtoTest.kt diff --git a/checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDtoTest.kt b/subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDtoTest.kt similarity index 100% rename from checklister-dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDtoTest.kt rename to subprojects/dto/src/test/kotlin/cloud/cosmin/checklister/lib/dto/ListGetDtoTest.kt diff --git a/checklister-event/build.gradle.kts b/subprojects/event/event.gradle.kts similarity index 78% rename from checklister-event/build.gradle.kts rename to subprojects/event/event.gradle.kts index 60f2a89..b448c98 100644 --- a/checklister-event/build.gradle.kts +++ b/subprojects/event/event.gradle.kts @@ -10,5 +10,5 @@ repositories { dependencies { // Kotlin implementation(kotlin("stdlib-jdk8")) - implementation(project(":checklister-dto")) + implementation(project(":dto")) } \ No newline at end of file diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/Event.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/Event.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/Event.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/Event.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ItemEvents.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ItemEvents.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ItemEvents.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ItemEvents.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ListEvents.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ListEvents.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ListEvents.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/ListEvents.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/model/RankOperation.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/model/RankOperation.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/model/RankOperation.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/model/RankOperation.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventDeserializer.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventDeserializer.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventDeserializer.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventDeserializer.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventSerializer.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventSerializer.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventSerializer.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/EventSerializer.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/ToStringEventSerializer.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/ToStringEventSerializer.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/ToStringEventSerializer.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/serde/ToStringEventSerializer.kt diff --git a/checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/sink/EventSink.kt b/subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/sink/EventSink.kt similarity index 100% rename from checklister-event/src/main/kotlin/cloud/cosmin/checklister/lib/event/sink/EventSink.kt rename to subprojects/event/src/main/kotlin/cloud/cosmin/checklister/lib/event/sink/EventSink.kt diff --git a/checklister-eventserde-json/build.gradle.kts b/subprojects/eventserde-json/eventserde-json.gradle.kts similarity index 87% rename from checklister-eventserde-json/build.gradle.kts rename to subprojects/eventserde-json/eventserde-json.gradle.kts index 1ec6ba7..d153d6d 100644 --- a/checklister-eventserde-json/build.gradle.kts +++ b/subprojects/eventserde-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")) } \ No newline at end of file diff --git a/checklister-eventserde-json/src/main/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerde.kt b/subprojects/eventserde-json/src/main/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerde.kt similarity index 100% rename from checklister-eventserde-json/src/main/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerde.kt rename to subprojects/eventserde-json/src/main/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerde.kt diff --git a/checklister-eventserde-json/src/test/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerdeTest.kt b/subprojects/eventserde-json/src/test/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerdeTest.kt similarity index 100% rename from checklister-eventserde-json/src/test/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerdeTest.kt rename to subprojects/eventserde-json/src/test/kotlin/cloud/cosmin/checklister/lib/eventserde/json/JsonEventSerdeTest.kt diff --git a/checklister-eventsink-kafka/build.gradle.kts b/subprojects/eventsink-kafka/eventsink-kafka.gradle.kts similarity index 88% rename from checklister-eventsink-kafka/build.gradle.kts rename to subprojects/eventsink-kafka/eventsink-kafka.gradle.kts index f1ac751..89e3fd9 100644 --- a/checklister-eventsink-kafka/build.gradle.kts +++ b/subprojects/eventsink-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/checklister-eventsink-kafka/src/integrationTest/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSinkTest.kt b/subprojects/eventsink-kafka/src/integrationTest/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSinkTest.kt similarity index 100% rename from checklister-eventsink-kafka/src/integrationTest/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSinkTest.kt rename to subprojects/eventsink-kafka/src/integrationTest/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSinkTest.kt diff --git a/checklister-eventsink-kafka/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSink.kt b/subprojects/eventsink-kafka/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSink.kt similarity index 100% rename from checklister-eventsink-kafka/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSink.kt rename to subprojects/eventsink-kafka/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/kafka/KafkaEventSink.kt diff --git a/checklister-eventsink-logger/build.gradle.kts b/subprojects/eventsink-logger/eventsink-logger.gradle.kts similarity index 82% rename from checklister-eventsink-logger/build.gradle.kts rename to subprojects/eventsink-logger/eventsink-logger.gradle.kts index c869a17..ba3faf4 100644 --- a/checklister-eventsink-logger/build.gradle.kts +++ b/subprojects/eventsink-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")) } \ No newline at end of file diff --git a/checklister-eventsink-logger/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/logger/LoggerEventSink.kt b/subprojects/eventsink-logger/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/logger/LoggerEventSink.kt similarity index 100% rename from checklister-eventsink-logger/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/logger/LoggerEventSink.kt rename to subprojects/eventsink-logger/src/main/kotlin/cloud/cosmin/checklister/lib/eventsink/logger/LoggerEventSink.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/BaseIT.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/BaseIT.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/BaseIT.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/BaseIT.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ItemUpdateIT.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ItemUpdateIT.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ItemUpdateIT.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ItemUpdateIT.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListCreationIT.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListCreationIT.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListCreationIT.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListCreationIT.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListUpdateIT.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListUpdateIT.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListUpdateIT.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/ListUpdateIT.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/LoginTest.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/LoginTest.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/LoginTest.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/LoginTest.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/Service.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/Service.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/Service.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/Service.kt diff --git a/checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/ServiceDiscovery.kt b/subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/ServiceDiscovery.kt similarity index 100% rename from checklister-web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/ServiceDiscovery.kt rename to subprojects/web/src/integrationTest/kotlin/cloud/cosmin/checklister/discovery/ServiceDiscovery.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/ChecklisterApplication.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/ChecklisterApplication.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/ChecklisterApplication.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/ChecklisterApplication.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/EventConfig.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/EventConfig.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/EventConfig.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/EventConfig.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/KafkaConfig.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/KafkaConfig.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/KafkaConfig.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/KafkaConfig.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/SwaggerConfig.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/SwaggerConfig.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/config/SwaggerConfig.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/config/SwaggerConfig.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/EventEntity.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/EventEntity.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/EventEntity.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/EventEntity.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/ItemEntity.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/ItemEntity.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/ItemEntity.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/ItemEntity.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/ListEntity.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/ListEntity.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/dao/ListEntity.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/dao/ListEntity.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/EventRepo.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/EventRepo.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/EventRepo.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/EventRepo.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/ItemRepo.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/ItemRepo.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/ItemRepo.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/ItemRepo.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/ListRepo.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/ListRepo.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/repo/ListRepo.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/repo/ListRepo.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/EventController.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/EventController.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/EventController.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/EventController.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/IndexController.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/IndexController.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/IndexController.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/IndexController.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/ItemController.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/ItemController.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/ItemController.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/ItemController.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/ListController.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/ListController.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/rest/ListController.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/rest/ListController.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/BuildConfigService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/BuildConfigService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/BuildConfigService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/BuildConfigService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ConverterService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ConverterService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ConverterService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ConverterService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ItemService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ItemService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ItemService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ItemService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ListService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ListService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/ListService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/ListService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/UuidService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/UuidService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/UuidService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/UuidService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/EventService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/EventService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/EventService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/EventService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/ItemEventService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/ItemEventService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/ItemEventService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/ItemEventService.kt diff --git a/checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/ListEventService.kt b/subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/ListEventService.kt similarity index 100% rename from checklister-web/src/main/kotlin/cloud/cosmin/checklister/service/event/ListEventService.kt rename to subprojects/web/src/main/kotlin/cloud/cosmin/checklister/service/event/ListEventService.kt diff --git a/checklister-web/src/main/resources/application.properties b/subprojects/web/src/main/resources/application.properties similarity index 100% rename from checklister-web/src/main/resources/application.properties rename to subprojects/web/src/main/resources/application.properties diff --git a/checklister-web/src/main/resources/db/migration/postgresql/V1_0__Initial_Database.sql b/subprojects/web/src/main/resources/db/migration/postgresql/V1_0__Initial_Database.sql similarity index 100% rename from checklister-web/src/main/resources/db/migration/postgresql/V1_0__Initial_Database.sql rename to subprojects/web/src/main/resources/db/migration/postgresql/V1_0__Initial_Database.sql diff --git a/checklister-web/src/main/resources/db/migration/postgresql/V1_1__Add_content_type_to_item.sql b/subprojects/web/src/main/resources/db/migration/postgresql/V1_1__Add_content_type_to_item.sql similarity index 100% rename from checklister-web/src/main/resources/db/migration/postgresql/V1_1__Add_content_type_to_item.sql rename to subprojects/web/src/main/resources/db/migration/postgresql/V1_1__Add_content_type_to_item.sql diff --git a/checklister-web/src/main/resources/db/migration/postgresql/V1_2__Drop_unique_rank_constraint.sql b/subprojects/web/src/main/resources/db/migration/postgresql/V1_2__Drop_unique_rank_constraint.sql similarity index 100% rename from checklister-web/src/main/resources/db/migration/postgresql/V1_2__Drop_unique_rank_constraint.sql rename to subprojects/web/src/main/resources/db/migration/postgresql/V1_2__Drop_unique_rank_constraint.sql diff --git a/checklister-web/src/main/resources/db/migration/postgresql/V1_3__Rank_functions.sql b/subprojects/web/src/main/resources/db/migration/postgresql/V1_3__Rank_functions.sql similarity index 100% rename from checklister-web/src/main/resources/db/migration/postgresql/V1_3__Rank_functions.sql rename to subprojects/web/src/main/resources/db/migration/postgresql/V1_3__Rank_functions.sql diff --git a/checklister-web/src/main/resources/db/migration/postgresql/V1_4__events.sql b/subprojects/web/src/main/resources/db/migration/postgresql/V1_4__events.sql similarity index 100% rename from checklister-web/src/main/resources/db/migration/postgresql/V1_4__events.sql rename to subprojects/web/src/main/resources/db/migration/postgresql/V1_4__events.sql diff --git a/checklister-web/src/main/resources/log4j2.xml b/subprojects/web/src/main/resources/log4j2.xml similarity index 100% rename from checklister-web/src/main/resources/log4j2.xml rename to subprojects/web/src/main/resources/log4j2.xml diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/dao/EventEntityTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/dao/EventEntityTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/dao/EventEntityTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/dao/EventEntityTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/dto/ListPostDtoTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/dto/ListPostDtoTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/dto/ListPostDtoTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/dto/ListPostDtoTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/repo/ItemRepoTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/repo/ItemRepoTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/repo/ItemRepoTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/repo/ItemRepoTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/repo/ListRepoTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/repo/ListRepoTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/repo/ListRepoTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/repo/ListRepoTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/rest/IndexControllerTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/rest/IndexControllerTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/rest/IndexControllerTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/rest/IndexControllerTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/rest/ListControllerTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/rest/ListControllerTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/rest/ListControllerTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/rest/ListControllerTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ConverterServiceTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ConverterServiceTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ConverterServiceTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ConverterServiceTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ItemServiceTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ItemServiceTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ItemServiceTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ItemServiceTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ListServiceTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ListServiceTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/ListServiceTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/ListServiceTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/UuidServiceTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/UuidServiceTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/UuidServiceTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/UuidServiceTest.kt diff --git a/checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/event/ItemEventServiceTest.kt b/subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/event/ItemEventServiceTest.kt similarity index 100% rename from checklister-web/src/test/kotlin/cloud/cosmin/checklister/service/event/ItemEventServiceTest.kt rename to subprojects/web/src/test/kotlin/cloud/cosmin/checklister/service/event/ItemEventServiceTest.kt diff --git a/checklister-web/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/subprojects/web/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from checklister-web/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to subprojects/web/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/checklister-web/build.gradle.kts b/subprojects/web/web.gradle.kts similarity index 95% rename from checklister-web/build.gradle.kts rename to subprojects/web/web.gradle.kts index d4b7f09..fa51f4f 100644 --- a/checklister-web/build.gradle.kts +++ b/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")) } \ No newline at end of file