From d82889d19299606f3276cc6ca50e31c24b472bde Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Mon, 23 Feb 2015 11:08:55 -0500 Subject: [PATCH] VIVO-914 path to TDB content directory may be absolute or relative to Vitro home directory --- .../triplesource/impl/tdb/ContentTripleSourceTDB.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java index 439cf2a63..78b8af9da 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/triplesource/impl/tdb/ContentTripleSourceTDB.java @@ -70,7 +70,7 @@ public class ContentTripleSourceTDB extends ContentTripleSource { public void startup(Application application, ComponentStartupStatus ss) { configureTDB(); try { - this.rdfService = new RDFServiceTDB(tdbPath); + this.rdfService = new RDFServiceTDB(resolveTdbPath(application)); this.rdfServiceFactory = createRDFServiceFactory(); this.unclosableRdfService = this.rdfServiceFactory.getRDFService(); this.dataset = new RDFServiceDataset(this.unclosableRdfService); @@ -82,6 +82,11 @@ public class ContentTripleSourceTDB extends ContentTripleSource { } } + private String resolveTdbPath(Application application) { + return application.getHomeDirectory().getPath().resolve(tdbPath) + .toString(); + } + private void configureTDB() { TDB.getContext().setTrue(TDB.symUnionDefaultGraph); }