Relocate triplestore/dropwizard application

trellis-ldp · Dec 4, 2019 · 11a5484 · 11a5484
1 parent 9c75151
commit 11a5484
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 3 deletions.
diff --git 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 → platform/dropwizard/README.md b/components/app-triplestore/README.md → platform/dropwizard/README.md
diff --git a/components/app-triplestore/build.gradle → platform/dropwizard/build.gradle b/components/app-triplestore/build.gradle → platform/dropwizard/build.gradle
diff --git a/...ldp/app/triplestore/AppConfiguration.java → ...ldp/app/triplestore/AppConfiguration.java b/...ldp/app/triplestore/AppConfiguration.java → ...ldp/app/triplestore/AppConfiguration.java
diff --git a/.../trellisldp/app/triplestore/AppUtils.java → .../trellisldp/app/triplestore/AppUtils.java b/.../trellisldp/app/triplestore/AppUtils.java → .../trellisldp/app/triplestore/AppUtils.java
diff --git a/...triplestore/RDFConnectionHealthCheck.java → ...triplestore/RDFConnectionHealthCheck.java b/...triplestore/RDFConnectionHealthCheck.java → ...triplestore/RDFConnectionHealthCheck.java
diff --git a/...p/app/triplestore/TrellisApplication.java → ...p/app/triplestore/TrellisApplication.java b/...p/app/triplestore/TrellisApplication.java → ...p/app/triplestore/TrellisApplication.java
diff --git a/...pp/triplestore/TrellisServiceBundler.java → ...pp/triplestore/TrellisServiceBundler.java b/...pp/triplestore/TrellisServiceBundler.java → ...pp/triplestore/TrellisServiceBundler.java
diff --git a/...llisldp/app/triplestore/package-info.java → ...llisldp/app/triplestore/package-info.java b/...llisldp/app/triplestore/package-info.java → ...llisldp/app/triplestore/package-info.java
diff --git a/...llisldp/app/triplestore/AppUtilsTest.java → ...llisldp/app/triplestore/AppUtilsTest.java b/...llisldp/app/triplestore/AppUtilsTest.java → ...llisldp/app/triplestore/AppUtilsTest.java
diff --git a/...lestore/RDFConnectionHealthCheckTest.java → ...lestore/RDFConnectionHealthCheckTest.java b/...lestore/RDFConnectionHealthCheckTest.java → ...lestore/RDFConnectionHealthCheckTest.java
diff --git a/...p/triplestore/TrellisApplicationTest.java → ...p/triplestore/TrellisApplicationTest.java b/...p/triplestore/TrellisApplicationTest.java → ...p/triplestore/TrellisApplicationTest.java
diff --git a/...triplestore/TrellisConfigurationTest.java → ...triplestore/TrellisConfigurationTest.java b/...triplestore/TrellisConfigurationTest.java → ...triplestore/TrellisConfigurationTest.java
diff --git a/...c/test/resources/app-data/namespaces.json → ...c/test/resources/app-data/namespaces.json b/...c/test/resources/app-data/namespaces.json → ...c/test/resources/app-data/namespaces.json
diff --git a/...riplestore/src/test/resources/config1.yml → ...dropwizard/src/test/resources/config1.yml b/...riplestore/src/test/resources/config1.yml → ...dropwizard/src/test/resources/config1.yml
diff --git a/...store/src/test/resources/logback-test.xml → ...izard/src/test/resources/logback-test.xml b/...store/src/test/resources/logback-test.xml → ...izard/src/test/resources/logback-test.xml
diff --git a/...ore/src/test/resources/trellis-config.yml → ...ard/src/test/resources/trellis-config.yml b/...ore/src/test/resources/trellis-config.yml → ...ard/src/test/resources/trellis-config.yml
diff --git a/...triplestore/src/test/resources/users.auth → .../dropwizard/src/test/resources/users.auth b/...triplestore/src/test/resources/users.auth → .../dropwizard/src/test/resources/users.auth
diff --git 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
@@ -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