From 11a5484618c54fe7482c9f2e02e1dcf0f11bff00 Mon Sep 17 00:00:00 2001 From: Aaron Coburn Date: Wed, 4 Dec 2019 17:39:54 -0500 Subject: [PATCH] Relocate triplestore/dropwizard application --- build.gradle | 1 + {components/app-triplestore => platform/dropwizard}/README.md | 0 .../app-triplestore => platform/dropwizard}/build.gradle | 0 .../java/org/trellisldp/app/triplestore/AppConfiguration.java | 0 .../main/java/org/trellisldp/app/triplestore/AppUtils.java | 0 .../trellisldp/app/triplestore/RDFConnectionHealthCheck.java | 0 .../org/trellisldp/app/triplestore/TrellisApplication.java | 0 .../org/trellisldp/app/triplestore/TrellisServiceBundler.java | 0 .../java/org/trellisldp/app/triplestore/package-info.java | 0 .../java/org/trellisldp/app/triplestore/AppUtilsTest.java | 0 .../app/triplestore/RDFConnectionHealthCheckTest.java | 0 .../trellisldp/app/triplestore/TrellisApplicationTest.java | 0 .../trellisldp/app/triplestore/TrellisConfigurationTest.java | 0 .../dropwizard}/src/test/resources/app-data/namespaces.json | 0 .../dropwizard}/src/test/resources/config1.yml | 0 .../dropwizard}/src/test/resources/logback-test.xml | 0 .../dropwizard}/src/test/resources/trellis-config.yml | 0 .../dropwizard}/src/test/resources/users.auth | 0 platform/server/build.gradle | 2 +- settings.gradle | 4 ++-- 20 files changed, 4 insertions(+), 3 deletions(-) rename {components/app-triplestore => platform/dropwizard}/README.md (100%) rename {components/app-triplestore => platform/dropwizard}/build.gradle (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/AppConfiguration.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/AppUtils.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheck.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/TrellisApplication.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/TrellisServiceBundler.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/main/java/org/trellisldp/app/triplestore/package-info.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/java/org/trellisldp/app/triplestore/AppUtilsTest.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheckTest.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/java/org/trellisldp/app/triplestore/TrellisApplicationTest.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/java/org/trellisldp/app/triplestore/TrellisConfigurationTest.java (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/resources/app-data/namespaces.json (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/resources/config1.yml (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/resources/logback-test.xml (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/resources/trellis-config.yml (100%) rename {components/app-triplestore => platform/dropwizard}/src/test/resources/users.auth (100%) diff --git a/build.gradle b/build.gradle index 8ee3d8ca9..1a1a00266 100644 --- a/build.gradle +++ b/build.gradle @@ -110,6 +110,7 @@ ext { ] omitFromMavenPublishing = [ + 'trellis-dropwizard-triplestore', 'trellis-osgi', 'trellis-server', 'trellis-quarkus', diff --git a/components/app-triplestore/README.md b/platform/dropwizard/README.md similarity index 100% rename from components/app-triplestore/README.md rename to platform/dropwizard/README.md diff --git a/components/app-triplestore/build.gradle b/platform/dropwizard/build.gradle similarity index 100% rename from components/app-triplestore/build.gradle rename to platform/dropwizard/build.gradle diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/AppConfiguration.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/AppConfiguration.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/AppConfiguration.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/AppConfiguration.java diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/AppUtils.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/AppUtils.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/AppUtils.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/AppUtils.java diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheck.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheck.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheck.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheck.java diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/TrellisApplication.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/TrellisApplication.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/TrellisApplication.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/TrellisApplication.java diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/TrellisServiceBundler.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/TrellisServiceBundler.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/TrellisServiceBundler.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/TrellisServiceBundler.java diff --git a/components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/package-info.java b/platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/package-info.java similarity index 100% rename from components/app-triplestore/src/main/java/org/trellisldp/app/triplestore/package-info.java rename to platform/dropwizard/src/main/java/org/trellisldp/app/triplestore/package-info.java diff --git a/components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/AppUtilsTest.java b/platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/AppUtilsTest.java similarity index 100% rename from components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/AppUtilsTest.java rename to platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/AppUtilsTest.java diff --git a/components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheckTest.java b/platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheckTest.java similarity index 100% rename from components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheckTest.java rename to platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/RDFConnectionHealthCheckTest.java diff --git a/components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/TrellisApplicationTest.java b/platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/TrellisApplicationTest.java similarity index 100% rename from components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/TrellisApplicationTest.java rename to platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/TrellisApplicationTest.java diff --git a/components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/TrellisConfigurationTest.java b/platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/TrellisConfigurationTest.java similarity index 100% rename from components/app-triplestore/src/test/java/org/trellisldp/app/triplestore/TrellisConfigurationTest.java rename to platform/dropwizard/src/test/java/org/trellisldp/app/triplestore/TrellisConfigurationTest.java diff --git a/components/app-triplestore/src/test/resources/app-data/namespaces.json b/platform/dropwizard/src/test/resources/app-data/namespaces.json similarity index 100% rename from components/app-triplestore/src/test/resources/app-data/namespaces.json rename to platform/dropwizard/src/test/resources/app-data/namespaces.json diff --git a/components/app-triplestore/src/test/resources/config1.yml b/platform/dropwizard/src/test/resources/config1.yml similarity index 100% rename from components/app-triplestore/src/test/resources/config1.yml rename to platform/dropwizard/src/test/resources/config1.yml diff --git a/components/app-triplestore/src/test/resources/logback-test.xml b/platform/dropwizard/src/test/resources/logback-test.xml similarity index 100% rename from components/app-triplestore/src/test/resources/logback-test.xml rename to platform/dropwizard/src/test/resources/logback-test.xml diff --git a/components/app-triplestore/src/test/resources/trellis-config.yml b/platform/dropwizard/src/test/resources/trellis-config.yml similarity index 100% rename from components/app-triplestore/src/test/resources/trellis-config.yml rename to platform/dropwizard/src/test/resources/trellis-config.yml diff --git a/components/app-triplestore/src/test/resources/users.auth b/platform/dropwizard/src/test/resources/users.auth similarity index 100% rename from components/app-triplestore/src/test/resources/users.auth rename to platform/dropwizard/src/test/resources/users.auth diff --git a/platform/server/build.gradle b/platform/server/build.gradle index 57798d0d1..96abacd8c 100644 --- a/platform/server/build.gradle +++ b/platform/server/build.gradle @@ -11,7 +11,7 @@ application { } dependencies { - implementation project(':trellis-app-triplestore') + implementation project(':trellis-dropwizard-triplestore') runtimeClasspath "jakarta.xml.bind:jakarta.xml.bind-api:$jaxbApiVersion" diff --git a/settings.gradle b/settings.gradle index cfecf28cf..aff02dab9 100755 --- a/settings.gradle +++ b/settings.gradle @@ -29,8 +29,8 @@ include ':trellis-triplestore' include ':trellis-webac' include ':trellis-webdav' -include ':trellis-app-triplestore' include ':trellis-bom' +include ':trellis-dropwizard-triplestore' include ':trellis-karaf' include ':trellis-openliberty' include ':trellis-osgi' @@ -54,7 +54,6 @@ project(':trellis-auth-basic').projectDir = "$rootDir/auth/basic" as File project(':trellis-auth-jwt').projectDir = "$rootDir/auth/jwt" as File project(':trellis-app').projectDir = "$rootDir/components/app" as File -project(':trellis-app-triplestore').projectDir = "$rootDir/components/app-triplestore" as File project(':trellis-audit').projectDir = "$rootDir/components/audit" as File project(':trellis-cache').projectDir = "$rootDir/components/cache" as File project(':trellis-cdi').projectDir = "$rootDir/components/cdi" as File @@ -71,6 +70,7 @@ project(':trellis-webdav').projectDir = "$rootDir/components/webdav" as File project(':trellis-rdfa').projectDir = "$rootDir/components/rdfa" as File project(':trellis-bom').projectDir = "$rootDir/platform/bom" as File +project(':trellis-dropwizard-triplestore').projectDir = "$rootDir/platform/dropwizard" as File project(':trellis-karaf').projectDir = "$rootDir/platform/karaf" as File project(':trellis-openliberty').projectDir = "$rootDir/platform/openliberty" as File project(':trellis-osgi').projectDir = "$rootDir/platform/osgi" as File