litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-248 Use /rdf instead of /rdffiles

Browse source
This commit is contained in:
j2blake 2013-08-21 15:55:19 -04:00
parent 1c475a5661
commit b0e0c773c9
11 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/build.xml
View file

@ -206,7 +206,7 @@
<copy todir="${vitrohome.image.dir}" file="${appbase.dir}/config/example.runtime.properties" />
<copy todir="${vitrohome.image.dir}" >
<fileset dir="${appbase.dir}" >
<include name="rdffiles/**/*" />
<include name="rdf/**/*" />
</fileset>
</copy>
</target>

0
webapp/rdffiles/display/everytime/displayModelListViews.rdf → webapp/rdf/display/everytime/displayModelListViews.rdf
View file

0
webapp/rdffiles/display/firsttime/application.owl → webapp/rdf/display/firsttime/application.owl
View file

0
webapp/rdffiles/display/firsttime/menu.n3 → webapp/rdf/display/firsttime/menu.n3
View file

0
webapp/rdffiles/display/firsttime/profilePageType.n3 → webapp/rdf/display/firsttime/profilePageType.n3
View file

0
webapp/rdffiles/displayDisplay/everytime/displayDisplay.n3 → webapp/rdf/displayDisplay/everytime/displayDisplay.n3
View file

0
webapp/rdffiles/displayTbox/everytime/displayTBOX.n3 → webapp/rdf/displayTbox/everytime/displayTBOX.n3
View file

0
webapp/rdffiles/tbox/filegraph/vitro-0.7.owl → webapp/rdf/tbox/filegraph/vitro-0.7.owl
View file

0
webapp/rdffiles/tbox/filegraph/vitroPublic.owl → webapp/rdf/tbox/filegraph/vitroPublic.owl
View file

6
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
View file

@ -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<Path> paths = getFilegraphPaths(ctx, RDFFILES, ABOX, FILEGRAPH);
Set<Path> 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);

8
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFFilesLoader.java
View file

@ -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<Path> paths = getPaths(locateHomeDirectory(ctx), RDF_FILES,
Set<Path> 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<Path> paths = getPaths(locateHomeDirectory(ctx), RDF_FILES,
modelPath, EVERY_TIME);
Set<Path> paths = getPaths(locateHomeDirectory(ctx), RDF, modelPath,
EVERY_TIME);
for (Path p : paths) {
readOntologyFileIntoModel(p, everytimeModel);
}