From b0e0c773c935bf63929040846385f5aade7ae471 Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 15:55:19 -0400 Subject: [PATCH] VIVO-248 Use /rdf instead of /rdffiles --- webapp/build.xml | 2 +- .../display/everytime/displayModelListViews.rdf | 0 .../{rdffiles => rdf}/display/firsttime/application.owl | 0 webapp/{rdffiles => rdf}/display/firsttime/menu.n3 | 0 .../display/firsttime/profilePageType.n3 | 0 .../displayDisplay/everytime/displayDisplay.n3 | 0 .../displayTbox/everytime/displayTBOX.n3 | 0 webapp/{rdffiles => rdf}/tbox/filegraph/vitro-0.7.owl | 0 webapp/{rdffiles => rdf}/tbox/filegraph/vitroPublic.owl | 0 .../vitro/webapp/servlet/setup/FileGraphSetup.java | 6 +++--- .../vitro/webapp/servlet/setup/RDFFilesLoader.java | 8 ++++---- 11 files changed, 8 insertions(+), 8 deletions(-) rename webapp/{rdffiles => rdf}/display/everytime/displayModelListViews.rdf (100%) rename webapp/{rdffiles => rdf}/display/firsttime/application.owl (100%) rename webapp/{rdffiles => rdf}/display/firsttime/menu.n3 (100%) rename webapp/{rdffiles => rdf}/display/firsttime/profilePageType.n3 (100%) rename webapp/{rdffiles => rdf}/displayDisplay/everytime/displayDisplay.n3 (100%) rename webapp/{rdffiles => rdf}/displayTbox/everytime/displayTBOX.n3 (100%) rename webapp/{rdffiles => rdf}/tbox/filegraph/vitro-0.7.owl (100%) rename webapp/{rdffiles => rdf}/tbox/filegraph/vitroPublic.owl (100%) diff --git a/webapp/build.xml b/webapp/build.xml index 6aae2b2af..6d7c066cf 100644 --- a/webapp/build.xml +++ b/webapp/build.xml @@ -206,7 +206,7 @@ - + diff --git a/webapp/rdffiles/display/everytime/displayModelListViews.rdf b/webapp/rdf/display/everytime/displayModelListViews.rdf similarity index 100% rename from webapp/rdffiles/display/everytime/displayModelListViews.rdf rename to webapp/rdf/display/everytime/displayModelListViews.rdf diff --git a/webapp/rdffiles/display/firsttime/application.owl b/webapp/rdf/display/firsttime/application.owl similarity index 100% rename from webapp/rdffiles/display/firsttime/application.owl rename to webapp/rdf/display/firsttime/application.owl diff --git a/webapp/rdffiles/display/firsttime/menu.n3 b/webapp/rdf/display/firsttime/menu.n3 similarity index 100% rename from webapp/rdffiles/display/firsttime/menu.n3 rename to webapp/rdf/display/firsttime/menu.n3 diff --git a/webapp/rdffiles/display/firsttime/profilePageType.n3 b/webapp/rdf/display/firsttime/profilePageType.n3 similarity index 100% rename from webapp/rdffiles/display/firsttime/profilePageType.n3 rename to webapp/rdf/display/firsttime/profilePageType.n3 diff --git a/webapp/rdffiles/displayDisplay/everytime/displayDisplay.n3 b/webapp/rdf/displayDisplay/everytime/displayDisplay.n3 similarity index 100% rename from webapp/rdffiles/displayDisplay/everytime/displayDisplay.n3 rename to webapp/rdf/displayDisplay/everytime/displayDisplay.n3 diff --git a/webapp/rdffiles/displayTbox/everytime/displayTBOX.n3 b/webapp/rdf/displayTbox/everytime/displayTBOX.n3 similarity index 100% rename from webapp/rdffiles/displayTbox/everytime/displayTBOX.n3 rename to webapp/rdf/displayTbox/everytime/displayTBOX.n3 diff --git a/webapp/rdffiles/tbox/filegraph/vitro-0.7.owl b/webapp/rdf/tbox/filegraph/vitro-0.7.owl similarity index 100% rename from webapp/rdffiles/tbox/filegraph/vitro-0.7.owl rename to webapp/rdf/tbox/filegraph/vitro-0.7.owl diff --git a/webapp/rdffiles/tbox/filegraph/vitroPublic.owl b/webapp/rdf/tbox/filegraph/vitroPublic.owl similarity index 100% rename from webapp/rdffiles/tbox/filegraph/vitroPublic.owl rename to webapp/rdf/tbox/filegraph/vitroPublic.owl diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java index 94c464cae..5e039e808 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java @@ -42,7 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; public class FileGraphSetup implements ServletContextListener { private static final Log log = LogFactory.getLog(FileGraphSetup.class); - private static final String RDFFILES = "rdffiles"; + private static final String RDF = "rdf"; private static final String ABOX = "abox"; private static final String TBOX = "tbox"; private static final String FILEGRAPH = "filegraph"; @@ -74,7 +74,7 @@ public class FileGraphSetup implements ServletContextListener { RDFServiceModelMaker maker = new RDFServiceModelMaker(RDFServiceUtils.getRDFServiceFactory(ctx)); // ABox files - Set paths = getFilegraphPaths(ctx, RDFFILES, ABOX, FILEGRAPH); + Set paths = getFilegraphPaths(ctx, RDF, ABOX, FILEGRAPH); cleanupDB(dataset, pathsToURIs(paths, ABOX), ABOX); @@ -82,7 +82,7 @@ public class FileGraphSetup implements ServletContextListener { aboxChanged = readGraphs(paths, maker, ABOX, aboxBaseModel); // TBox files - paths = getFilegraphPaths(ctx, RDFFILES, TBOX, FILEGRAPH); + paths = getFilegraphPaths(ctx, RDF, TBOX, FILEGRAPH); cleanupDB(dataset, pathsToURIs(paths, TBOX),TBOX); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java index cbd0f8c3d..50838e472 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java @@ -33,7 +33,7 @@ public class RDFFilesLoader { private static final String PROPERTY_VITRO_HOME = "vitro.home"; private static final String DEFAULT_RDF_FORMAT = "RDF/XML"; - private static final String RDF_FILES = "rdffiles"; + private static final String RDF = "rdf"; private static final String FIRST_TIME = "firsttime"; private static final String EVERY_TIME = "everytime"; @@ -64,7 +64,7 @@ public class RDFFilesLoader { public static void loadFirstTimeFiles(ServletContext ctx, String modelPath, Model model, boolean firstTime) { if (firstTime) { - Set paths = getPaths(locateHomeDirectory(ctx), RDF_FILES, + Set paths = getPaths(locateHomeDirectory(ctx), RDF, modelPath, FIRST_TIME); for (Path p : paths) { readOntologyFileIntoModel(p, model); @@ -87,8 +87,8 @@ public class RDFFilesLoader { OntModel model) { OntModel everytimeModel = ModelFactory .createOntologyModel(OntModelSpec.OWL_MEM); - Set paths = getPaths(locateHomeDirectory(ctx), RDF_FILES, - modelPath, EVERY_TIME); + Set paths = getPaths(locateHomeDirectory(ctx), RDF, modelPath, + EVERY_TIME); for (Path p : paths) { readOntologyFileIntoModel(p, everytimeModel); }