VIVO-914 path to TDB content directory may be absolute or relative to Vitro home directory

This commit is contained in:
Jim Blake 2015-02-23 11:08:55 -05:00
parent ab60341355
commit d82889d192

View file

@ -70,7 +70,7 @@ public class ContentTripleSourceTDB extends ContentTripleSource {
public void startup(Application application, ComponentStartupStatus ss) { public void startup(Application application, ComponentStartupStatus ss) {
configureTDB(); configureTDB();
try { try {
this.rdfService = new RDFServiceTDB(tdbPath); this.rdfService = new RDFServiceTDB(resolveTdbPath(application));
this.rdfServiceFactory = createRDFServiceFactory(); this.rdfServiceFactory = createRDFServiceFactory();
this.unclosableRdfService = this.rdfServiceFactory.getRDFService(); this.unclosableRdfService = this.rdfServiceFactory.getRDFService();
this.dataset = new RDFServiceDataset(this.unclosableRdfService); 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() { private void configureTDB() {
TDB.getContext().setTrue(TDB.symUnionDefaultGraph); TDB.getContext().setTrue(TDB.symUnionDefaultGraph);
} }