From d084e9620d199c797174a61a43831d01ba2a49ca Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 16:16:48 -0400 Subject: [PATCH 1/2] Accidentally committed catalog-v001.xml --- .gitignore | 1 + ontology/public/catalog-v001.xml | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 ontology/public/catalog-v001.xml diff --git a/.gitignore b/.gitignore index ae5cbdb8..bcb3b16e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /deploy.properties /build.properties /runtime.properties +catalog-v001.xml diff --git a/ontology/public/catalog-v001.xml b/ontology/public/catalog-v001.xml deleted file mode 100644 index 1b92b5e2..00000000 --- a/ontology/public/catalog-v001.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From e97d2259e8df24e74e8fd88692af4d114a992f6b Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 17:16:28 -0400 Subject: [PATCH 2/2] VIVO-248 Describe RDF changes in upgrade document --- doc/upgrade-1.6.html | 143 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 135 insertions(+), 8 deletions(-) diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html index fe92dcf8..39a6e0f3 100644 --- a/doc/upgrade-1.6.html +++ b/doc/upgrade-1.6.html @@ -229,16 +229,138 @@ areas of geographic focus.

-

    • Auto-loaded RDF files move to the Home directory

    -

    - BOGUS - Any customizations will need to be adjusted. - Change to the build process, so Three-tier build must adapt. - Holly must store the user login data in a different place: [vivo]/rdffiles/auth/firsttime -

    - +

    + The RDF files that initialize the data model have moved, in both the distribution and + the runtime locations. + In the distribution, they have been collected in one place, and reorganized to use + a more consistent naming scheme. During the build process, they are copied to a + location within the VIVO home directory, instead of residing in the webapp itself. +

    +

    + If you have modified these RDF files, or added files of your own, you must adjust to + the new locations accordingly. + +

    +
    Old locations of RDF files
    +
    /WEB-INF/ontologies/app/application.owl
+/WEB-INF/ontologies/app/aboutPage.n3
+/WEB-INF/ontologies/app/menu.n3
+/WEB-INF/ontologies/app/profilePageType.n3
+/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf
+/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
+/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3
+/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
+/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3
+/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3
+/WEB-INF/ontologies/app/menuload/displayTBOX.n3
+/WEB-INF/ontologies/app/menuload/displayDisplay.n3
+/WEB-INF/init-data/initialSiteConfig.rdf
+/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf
+/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3
+/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf
+/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf
+/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf
+/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf
+/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf
+/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf
+/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf
+/WEB-INF/filegraph/abox/us-states.rdf
+/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl
+/WEB-INF/filegraph/abox/academicDegree.rdf
+/WEB-INF/filegraph/abox/documentStatus.owl
+/WEB-INF/filegraph/abox/continents.n3
+/WEB-INF/filegraph/abox/vocabularySource.n3
+/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl
+/WEB-INF/filegraph/tbox/vitroPublic.owl
+/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl
+/WEB-INF/filegraph/tbox/scires-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-core-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl
+/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
+/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-event-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl
+/WEB-INF/filegraph/tbox/vitro-0.7.owl
+/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl
+/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl
+/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl
    +
    New locations of RDF files
    +
    rdf/display/firsttime/aboutPage.n3
+rdf/display/firsttime/application.owl
+rdf/display/firsttime/menu.n3
+rdf/display/firsttime/profilePageType.n3
+rdf/display/everytime/displayModelListViews.rdf
+rdf/display/everytime/homePageDataGetters.n3
+rdf/display/everytime/localeSelectionGUI.n3
+rdf/display/everytime/vivoListViewConfig.rdf
+rdf/display/everytime/vivoOrganizationDataGetters.n3
+rdf/display/everytime/vivoSearchProhibited.n3
+rdf/displayTbox/everytime/displayTBOX.n3
+rdf/displayDisplay/everytime/displayDisplay.n3
+rdf/applicationMetadata/firsttime/classgroups.rdf
+rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
+rdf/applicationMetadata/firsttime/propertygroups.rdf
+rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
+rdf/abox/firsttime/vocabularySource-labels.n3
+rdf/abox/filegraph/abox/academicDegree.rdf
+rdf/abox/filegraph/abox/continents.n3
+rdf/abox/filegraph/abox/dateTimeValuePrecision.owl
+rdf/abox/filegraph/abox/documentStatus.owl
+rdf/abox/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl
+rdf/abox/filegraph/abox/us-states.rdf
+rdf/abox/filegraph/abox/vocabularySource.n3
+rdf/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf
+rdf/tbox/firsttime/isDefinedBy-1.5-annotations.rdf
+rdf/tbox/firsttime/scires-1.5-annotations.rdf
+rdf/tbox/firsttime/vitro-0.7-annotations.rdf
+rdf/tbox/firsttime/vivo-core-1.5-annotations.rdf
+rdf/tbox/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
+rdf/tbox/filegraph/tbox/isDefinedBy-1.5.owl
+rdf/tbox/filegraph/tbox/scires-1.5.owl
+rdf/tbox/filegraph/tbox/vitro-0.7.owl
+rdf/tbox/filegraph/tbox/vitroPublic.owl
+rdf/tbox/filegraph/tbox/vivo-bibo-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-c4o-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-core-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-dcelements-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-dcterms-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-event-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-fabio-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-foaf-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-pws-1.5.owl
+rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl
    +

    + If you are using a three-tier build process, you will need to add a single line + to the build script so the RDF files will be merged properly across the tiers. So this: +

    <patternset id="appbase.patterns">
+<include name="src/**/*" />
+<include name="lib/**/*" />
+<include name="test/**/*" />
+<include name="themes/**/*" />
+<include name="config/*.properties" />
+<include name="config/*.txt" />
+<include name="config/jarlist/*.txt" />
+<include name="config/solr/*" />
+<include name="context.xml" />
+</patternset>
    + becomes this: + 
    <patternset id="appbase.patterns">
+<include name="src/**/*" />
+<include name="lib/**/*" />
+<include name="rdf/**/*" />
+<include name="test/**/*" />
+<include name="themes/**/*" />
+<include name="config/*.properties" />
+<include name="config/*.txt" />
+<include name="config/jarlist/*.txt" />
+<include name="config/solr/*" />
+<include name="context.xml" />
+</patternset>
    +

    ANYTHING ELSE?

    @@ -526,6 +648,11 @@ +

    + 4. Apply any previous changes you have made to the RDF initialization files. + See the section on the Auto-loaded RDF files + above for more details. +

    5. Stop Apache Tomcat and from your VIVO source directory, run ant