From ee707311dbcfb8cd304003e4fe4523891d89b644 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Wed, 9 Nov 2011 18:39:25 +0000 Subject: [PATCH] NIHVIVO-3104 vitro tbox filegraphs to support visibility of uploaded images in a plain vitro deployment --- .../webapp/servlet/setup/JenaDataSourceSetup.java | 11 +---------- .../system => filegraph/tbox}/vitro-0.7.owl | 0 .../system => filegraph/tbox}/vitroPublic.owl | 0 3 files changed, 1 insertion(+), 10 deletions(-) rename webapp/web/WEB-INF/{ontologies/system => filegraph/tbox}/vitro-0.7.owl (100%) rename webapp/web/WEB-INF/{ontologies/system => filegraph/tbox}/vitroPublic.owl (100%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java index 52a40a165..08769fcb1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java @@ -217,14 +217,6 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java loadDataFromFilesystem(baseOms, ctx); } - log.info("Adding vitro application ontology"); - - // add the vitroontologies to the tbox models - OntModel vitroTBoxModel = (new JenaBaseDaoCon()).getConstModel(); - baseOms.getTBoxModel().addSubModel(vitroTBoxModel); - inferenceOms.getTBoxModel().addSubModel(vitroTBoxModel); - unionOms.getTBoxModel().addSubModel(vitroTBoxModel); - log.info("Setting up union models and DAO factories"); // create TBox + ABox union models and set up webapp DAO factories @@ -375,8 +367,7 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java readOntologyFilesInPathSet(USER_TBOX_PATH, ctx, baseOms.getTBoxModel()); readOntologyFilesInPathSet( USER_APPMETA_PATH, ctx, baseOms.getApplicationMetadataModel()); - //readOntologyFilesInPathSet(SYSTEMPATH, ctx, initialDataModel); - log.debug(((System.currentTimeMillis()-startTime)/1000) + log.debug(((System.currentTimeMillis() - startTime) / 1000) + " seconds to read RDF files "); } diff --git a/webapp/web/WEB-INF/ontologies/system/vitro-0.7.owl b/webapp/web/WEB-INF/filegraph/tbox/vitro-0.7.owl similarity index 100% rename from webapp/web/WEB-INF/ontologies/system/vitro-0.7.owl rename to webapp/web/WEB-INF/filegraph/tbox/vitro-0.7.owl diff --git a/webapp/web/WEB-INF/ontologies/system/vitroPublic.owl b/webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl similarity index 100% rename from webapp/web/WEB-INF/ontologies/system/vitroPublic.owl rename to webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl