From e5df3b70baedf0fe76145f145a23a81488b5176b Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 19 Aug 2013 14:52:03 -0400 Subject: [PATCH 1/7] another minor correction to the text --- productMods/WEB-INF/ontologies/app/aboutPage.n3 | 2 +- .../WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/productMods/WEB-INF/ontologies/app/aboutPage.n3 b/productMods/WEB-INF/ontologies/app/aboutPage.n3 index cb26b08c..c606c2d5 100644 --- a/productMods/WEB-INF/ontologies/app/aboutPage.n3 +++ b/productMods/WEB-INF/ontologies/app/aboutPage.n3 @@ -8,7 +8,7 @@ about:ABOUTDG """

About VIVO

The VIVO application enables the discovery of researchers across institutions. Participants in the network include institutions with local installations of VIVO or those with research discovery and profiling applications that can provide semantic web-compliant data. The information accessible through VIVO's search and browse capability will therefore reside and be controlled locally, within institutional VIVOs or other semantic web-compliant applications.

-

VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with content at an institution, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually or brought into the database in automated ways from local systems of record, such as grants, course, and faculty activity databases.

+

VIVO is an open source semantic web application originally developed and implemented at Cornell. When installed and populated with content at an institution, it enables the discovery of research and scholarship across disciplines at that institution. VIVO supports browsing and a search function which returns faceted results for rapid retrieval of desired information. Content in any local VIVO installation may be maintained manually or brought into the database in automated ways from local systems of record, such as human resources, scholarships, grants, course, and faculty activity databases.

See more information on the VIVO Project.

"""@en ; diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 b/productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 index 8d8ddd69..74f7a3c4 100644 --- a/productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 +++ b/productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 @@ -7,7 +7,7 @@ about:ABOUTDG """

Acerca VIVO

La aplicación VIVO permite el descubrimiento de los investigadores a través de las instituciones. Los participantes en la red se encuentran instituciones con instalaciones locales de VIVO o con la investigación y el descubrimiento de aplicaciones de perfiles que pueden proporcionar datos web compatibles semánticas. Por tanto, la información accesible a través de la búsqueda de VIVO y capacidad de exploración se residir y ser controlado a nivel local, dentro de vivos institucionales o de otras aplicaciones web compatibles con semánticos.

-

VIVO es una aplicación web semántica código abierto originalmente desarrollado e implementado en Cornell. Cuando se instala y se rellena con el contenido en una institución, que permite el descubrimiento de la investigación y de becas en todas las disciplinas de esta institución. VIVO compatible con la navegación y una función de búsqueda que devuelve resultados facetas para una rápida recuperación de la información deseada. Contenido en cualquier instalación VIVO local puede mantenerse manualmente o puesto en la base de datos de forma automática de los sistemas locales de registro, tales como recursos humanos, carreras impulsadas, becas, cursos, y bases de datos de la actividad docente.

+

VIVO es una aplicación web semántica código abierto originalmente desarrollado e implementado en Cornell. Cuando se instala y se rellena con el contenido en una institución, que permite el descubrimiento de la investigación y de becas en todas las disciplinas de esta institución. VIVO compatible con la navegación y una función de búsqueda que devuelve resultados facetas para una rápida recuperación de la información deseada. Contenido en cualquier instalación VIVO local puede mantenerse manualmente o puesto en la base de datos de forma automática de los sistemas locales de registro, tales como recursos humanos, becas, cursos, y bases de datos de la actividad docente.

Ver más información sobre el Proyecto VIVO.

"""@es . \ No newline at end of file From ca951c6bf3a9a09ed08ba6fb109f17f4e8e37d0d Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 20 Aug 2013 15:26:09 -0400 Subject: [PATCH 2/7] VIVO-248 Move filegraph RDF files into the home directory --- build.xml | 1 + doc/upgrade-1.6.html | 11 +++++++++++ .../abox/filegraph}/academicDegree.rdf | 0 .../abox => rdffiles/abox/filegraph}/continents.n3 | 0 .../abox/filegraph}/dateTimeValuePrecision.owl | 0 .../abox/filegraph}/documentStatus.owl | 0 .../filegraph}/geopolitical.abox.ver1.1-11-18-11.owl | 0 .../abox => rdffiles/abox/filegraph}/us-states.rdf | 0 .../abox/filegraph}/vocabularySource.n3 | 0 .../filegraph}/geopolitical.tbox.ver1.1-11-18-11.owl | 0 .../tbox/filegraph}/isDefinedBy-1.5.owl | 0 .../tbox => rdffiles/tbox/filegraph}/scires-1.5.owl | 0 .../tbox/filegraph}/vivo-bibo-1.5.owl | 0 .../tbox => rdffiles/tbox/filegraph}/vivo-c4o-1.5.owl | 0 .../tbox/filegraph}/vivo-core-1.5.owl | 0 .../tbox/filegraph}/vivo-dcelements-1.5.owl | 0 .../tbox/filegraph}/vivo-dcterms-1.5.owl | 0 .../tbox/filegraph}/vivo-event-1.5.owl | 0 .../tbox/filegraph}/vivo-fabio-1.5.owl | 0 .../tbox/filegraph}/vivo-foaf-1.5.owl | 0 .../tbox => rdffiles/tbox/filegraph}/vivo-pws-1.5.owl | 0 .../tbox/filegraph}/vivo-skos-1.5.owl | 0 22 files changed, 12 insertions(+) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/academicDegree.rdf (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/continents.n3 (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/dateTimeValuePrecision.owl (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/documentStatus.owl (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/geopolitical.abox.ver1.1-11-18-11.owl (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/us-states.rdf (100%) rename {productMods/WEB-INF/filegraph/abox => rdffiles/abox/filegraph}/vocabularySource.n3 (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/geopolitical.tbox.ver1.1-11-18-11.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/isDefinedBy-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/scires-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-bibo-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-c4o-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-core-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-dcelements-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-dcterms-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-event-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-fabio-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-foaf-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-pws-1.5.owl (100%) rename {productMods/WEB-INF/filegraph/tbox => rdffiles/tbox/filegraph}/vivo-skos-1.5.owl (100%) diff --git a/build.xml b/build.xml index ba031f79..ae687a97 100644 --- a/build.xml +++ b/build.xml @@ -69,6 +69,7 @@ + diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html index 0ee222ad..7e735e91 100644 --- a/doc/upgrade-1.6.html +++ b/doc/upgrade-1.6.html @@ -48,6 +48,7 @@
  • The foaf:Person template has been re-located.
  • Multiple foaf:Person Profile Pages
  • Home Page Re-design
    • +
  • Auto-loaded RDF files move to the Home directory
  • ANYTHING ELSE?
    • @@ -228,6 +229,16 @@ 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. +

    + + +

    ANYTHING ELSE?

    diff --git a/productMods/WEB-INF/filegraph/abox/academicDegree.rdf b/rdffiles/abox/filegraph/academicDegree.rdf similarity index 100% rename from productMods/WEB-INF/filegraph/abox/academicDegree.rdf rename to rdffiles/abox/filegraph/academicDegree.rdf diff --git a/productMods/WEB-INF/filegraph/abox/continents.n3 b/rdffiles/abox/filegraph/continents.n3 similarity index 100% rename from productMods/WEB-INF/filegraph/abox/continents.n3 rename to rdffiles/abox/filegraph/continents.n3 diff --git a/productMods/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl b/rdffiles/abox/filegraph/dateTimeValuePrecision.owl similarity index 100% rename from productMods/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl rename to rdffiles/abox/filegraph/dateTimeValuePrecision.owl diff --git a/productMods/WEB-INF/filegraph/abox/documentStatus.owl b/rdffiles/abox/filegraph/documentStatus.owl similarity index 100% rename from productMods/WEB-INF/filegraph/abox/documentStatus.owl rename to rdffiles/abox/filegraph/documentStatus.owl diff --git a/productMods/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl b/rdffiles/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl similarity index 100% rename from productMods/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl rename to rdffiles/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl diff --git a/productMods/WEB-INF/filegraph/abox/us-states.rdf b/rdffiles/abox/filegraph/us-states.rdf similarity index 100% rename from productMods/WEB-INF/filegraph/abox/us-states.rdf rename to rdffiles/abox/filegraph/us-states.rdf diff --git a/productMods/WEB-INF/filegraph/abox/vocabularySource.n3 b/rdffiles/abox/filegraph/vocabularySource.n3 similarity index 100% rename from productMods/WEB-INF/filegraph/abox/vocabularySource.n3 rename to rdffiles/abox/filegraph/vocabularySource.n3 diff --git a/productMods/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl b/rdffiles/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl rename to rdffiles/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl diff --git a/productMods/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl b/rdffiles/tbox/filegraph/isDefinedBy-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl rename to rdffiles/tbox/filegraph/isDefinedBy-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/scires-1.5.owl b/rdffiles/tbox/filegraph/scires-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/scires-1.5.owl rename to rdffiles/tbox/filegraph/scires-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl b/rdffiles/tbox/filegraph/vivo-bibo-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl rename to rdffiles/tbox/filegraph/vivo-bibo-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl b/rdffiles/tbox/filegraph/vivo-c4o-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl rename to rdffiles/tbox/filegraph/vivo-c4o-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-core-1.5.owl b/rdffiles/tbox/filegraph/vivo-core-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-core-1.5.owl rename to rdffiles/tbox/filegraph/vivo-core-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl b/rdffiles/tbox/filegraph/vivo-dcelements-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl rename to rdffiles/tbox/filegraph/vivo-dcelements-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl b/rdffiles/tbox/filegraph/vivo-dcterms-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl rename to rdffiles/tbox/filegraph/vivo-dcterms-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-event-1.5.owl b/rdffiles/tbox/filegraph/vivo-event-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-event-1.5.owl rename to rdffiles/tbox/filegraph/vivo-event-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl b/rdffiles/tbox/filegraph/vivo-fabio-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl rename to rdffiles/tbox/filegraph/vivo-fabio-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl b/rdffiles/tbox/filegraph/vivo-foaf-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl rename to rdffiles/tbox/filegraph/vivo-foaf-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl b/rdffiles/tbox/filegraph/vivo-pws-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl rename to rdffiles/tbox/filegraph/vivo-pws-1.5.owl diff --git a/productMods/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl b/rdffiles/tbox/filegraph/vivo-skos-1.5.owl similarity index 100% rename from productMods/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl rename to rdffiles/tbox/filegraph/vivo-skos-1.5.owl From 71ce2beffce6084d2364b4a1d885a474376f2717 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 20 Aug 2013 17:14:09 -0400 Subject: [PATCH 3/7] VIVO-248 Move more RDF files into the home directory Files for initializing the TBOX, ABOX, ApplicationMetadata and UserAccounts models. --- doc/upgrade-1.6.html | 1 + .../geopolitical.ver1.1-11-18-11-individual-labels.rdf | 0 .../abox => rdffiles/abox/firsttime}/vocabularySource-labels.n3 | 0 .../applicationMetadata/firsttime}/classgroups.rdf | 0 .../applicationMetadata/firsttime}/classgroups_labels_es.n3 | 0 .../applicationMetadata/firsttime}/initialSiteConfig.rdf | 0 .../applicationMetadata/firsttime}/propertygroups.rdf | 0 .../applicationMetadata/firsttime}/propertygroups_labels_es.n3 | 0 .../tbox/firsttime}/geopolitical-ver1.1-11-18-11-annotations.rdf | 0 .../tbox/firsttime}/isDefinedBy-1.5-annotations.rdf | 0 .../tbox => rdffiles/tbox/firsttime}/scires-1.5-annotations.rdf | 0 .../tbox => rdffiles/tbox/firsttime}/vitro-0.7-annotations.rdf | 0 .../tbox/firsttime}/vivo-core-1.5-annotations.rdf | 0 .../tbox => rdffiles/tbox/firsttime}/vivo-core-1.5-labels_es.n3 | 0 14 files changed, 1 insertion(+) rename {productMods/WEB-INF/ontologies/user/abox => rdffiles/abox/firsttime}/geopolitical.ver1.1-11-18-11-individual-labels.rdf (100%) rename {productMods/WEB-INF/ontologies/user/abox => rdffiles/abox/firsttime}/vocabularySource-labels.n3 (100%) rename {productMods/WEB-INF/ontologies/user/applicationMetadata => rdffiles/applicationMetadata/firsttime}/classgroups.rdf (100%) rename {productMods/WEB-INF/ontologies/user/applicationMetadata => rdffiles/applicationMetadata/firsttime}/classgroups_labels_es.n3 (100%) rename {productMods/WEB-INF/init-data => rdffiles/applicationMetadata/firsttime}/initialSiteConfig.rdf (100%) rename {productMods/WEB-INF/ontologies/user/applicationMetadata => rdffiles/applicationMetadata/firsttime}/propertygroups.rdf (100%) rename {productMods/WEB-INF/ontologies/user/applicationMetadata => rdffiles/applicationMetadata/firsttime}/propertygroups_labels_es.n3 (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/geopolitical-ver1.1-11-18-11-annotations.rdf (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/isDefinedBy-1.5-annotations.rdf (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/scires-1.5-annotations.rdf (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/vitro-0.7-annotations.rdf (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/vivo-core-1.5-annotations.rdf (100%) rename {productMods/WEB-INF/ontologies/user/tbox => rdffiles/tbox/firsttime}/vivo-core-1.5-labels_es.n3 (100%) diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html index 7e735e91..fe92dcf8 100644 --- a/doc/upgrade-1.6.html +++ b/doc/upgrade-1.6.html @@ -235,6 +235,7 @@ 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

    diff --git a/productMods/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf b/rdffiles/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf rename to rdffiles/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf diff --git a/productMods/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3 b/rdffiles/abox/firsttime/vocabularySource-labels.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3 rename to rdffiles/abox/firsttime/vocabularySource-labels.n3 diff --git a/productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf b/rdffiles/applicationMetadata/firsttime/classgroups.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf rename to rdffiles/applicationMetadata/firsttime/classgroups.rdf diff --git a/productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups_labels_es.n3 b/rdffiles/applicationMetadata/firsttime/classgroups_labels_es.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/user/applicationMetadata/classgroups_labels_es.n3 rename to rdffiles/applicationMetadata/firsttime/classgroups_labels_es.n3 diff --git a/productMods/WEB-INF/init-data/initialSiteConfig.rdf b/rdffiles/applicationMetadata/firsttime/initialSiteConfig.rdf similarity index 100% rename from productMods/WEB-INF/init-data/initialSiteConfig.rdf rename to rdffiles/applicationMetadata/firsttime/initialSiteConfig.rdf diff --git a/productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf b/rdffiles/applicationMetadata/firsttime/propertygroups.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf rename to rdffiles/applicationMetadata/firsttime/propertygroups.rdf diff --git a/productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups_labels_es.n3 b/rdffiles/applicationMetadata/firsttime/propertygroups_labels_es.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/user/applicationMetadata/propertygroups_labels_es.n3 rename to rdffiles/applicationMetadata/firsttime/propertygroups_labels_es.n3 diff --git a/productMods/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf b/rdffiles/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf rename to rdffiles/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf diff --git a/productMods/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf b/rdffiles/tbox/firsttime/isDefinedBy-1.5-annotations.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf rename to rdffiles/tbox/firsttime/isDefinedBy-1.5-annotations.rdf diff --git a/productMods/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf b/rdffiles/tbox/firsttime/scires-1.5-annotations.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf rename to rdffiles/tbox/firsttime/scires-1.5-annotations.rdf diff --git a/productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf b/rdffiles/tbox/firsttime/vitro-0.7-annotations.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf rename to rdffiles/tbox/firsttime/vitro-0.7-annotations.rdf diff --git a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf b/rdffiles/tbox/firsttime/vivo-core-1.5-annotations.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf rename to rdffiles/tbox/firsttime/vivo-core-1.5-annotations.rdf diff --git a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.5-labels_es.n3 b/rdffiles/tbox/firsttime/vivo-core-1.5-labels_es.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.5-labels_es.n3 rename to rdffiles/tbox/firsttime/vivo-core-1.5-labels_es.n3 From 37c35468cadcf8b4a29f02db77a968d64959bb7b Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 11:27:41 -0400 Subject: [PATCH 4/7] VIVO-248 Move more RDF files into the home directory Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader. --- .../display/everytime}/aboutPage_es.n3 | 0 .../display/everytime}/homePageDataGetters.n3 | 0 .../display/everytime}/localeSelectionGUI.n3 | 0 .../app/loadedAtStartup => rdffiles/display/everytime}/menu_es.n3 | 0 .../display/everytime}/vivoListViewConfig.rdf | 0 .../display/everytime}/vivoOrganizationDataGetters.n3 | 0 .../display/everytime}/vivoSearchProhibited.n3 | 0 .../ontologies/app => rdffiles/display/firsttime}/aboutPage.n3 | 0 .../WEB-INF/ontologies/app => rdffiles/display/firsttime}/menu.n3 | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/aboutPage_es.n3 (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/homePageDataGetters.n3 (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/localeSelectionGUI.n3 (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/menu_es.n3 (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/vivoListViewConfig.rdf (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/vivoOrganizationDataGetters.n3 (100%) rename {productMods/WEB-INF/ontologies/app/loadedAtStartup => rdffiles/display/everytime}/vivoSearchProhibited.n3 (100%) rename {productMods/WEB-INF/ontologies/app => rdffiles/display/firsttime}/aboutPage.n3 (100%) rename {productMods/WEB-INF/ontologies/app => rdffiles/display/firsttime}/menu.n3 (100%) diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 b/rdffiles/display/everytime/aboutPage_es.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/aboutPage_es.n3 rename to rdffiles/display/everytime/aboutPage_es.n3 diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3 b/rdffiles/display/everytime/homePageDataGetters.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3 rename to rdffiles/display/everytime/homePageDataGetters.n3 diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3 b/rdffiles/display/everytime/localeSelectionGUI.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3 rename to rdffiles/display/everytime/localeSelectionGUI.n3 diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/menu_es.n3 b/rdffiles/display/everytime/menu_es.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/menu_es.n3 rename to rdffiles/display/everytime/menu_es.n3 diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf b/rdffiles/display/everytime/vivoListViewConfig.rdf similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf rename to rdffiles/display/everytime/vivoListViewConfig.rdf diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3 b/rdffiles/display/everytime/vivoOrganizationDataGetters.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3 rename to rdffiles/display/everytime/vivoOrganizationDataGetters.n3 diff --git a/productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3 b/rdffiles/display/everytime/vivoSearchProhibited.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3 rename to rdffiles/display/everytime/vivoSearchProhibited.n3 diff --git a/productMods/WEB-INF/ontologies/app/aboutPage.n3 b/rdffiles/display/firsttime/aboutPage.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/aboutPage.n3 rename to rdffiles/display/firsttime/aboutPage.n3 diff --git a/productMods/WEB-INF/ontologies/app/menu.n3 b/rdffiles/display/firsttime/menu.n3 similarity index 100% rename from productMods/WEB-INF/ontologies/app/menu.n3 rename to rdffiles/display/firsttime/menu.n3 From 5f7bbc67996e7399f7e5b669bc208716045f0d0d Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 15:55:07 -0400 Subject: [PATCH 5/7] VIVO-248 Use /rdf instead of /rdffiles --- build.xml | 2 +- {rdffiles => rdf}/abox/filegraph/academicDegree.rdf | 0 {rdffiles => rdf}/abox/filegraph/continents.n3 | 0 {rdffiles => rdf}/abox/filegraph/dateTimeValuePrecision.owl | 0 {rdffiles => rdf}/abox/filegraph/documentStatus.owl | 0 .../abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl | 0 {rdffiles => rdf}/abox/filegraph/us-states.rdf | 0 {rdffiles => rdf}/abox/filegraph/vocabularySource.n3 | 0 .../geopolitical.ver1.1-11-18-11-individual-labels.rdf | 0 {rdffiles => rdf}/abox/firsttime/vocabularySource-labels.n3 | 0 {rdffiles => rdf}/applicationMetadata/firsttime/classgroups.rdf | 0 .../applicationMetadata/firsttime/classgroups_labels_es.n3 | 0 .../applicationMetadata/firsttime/initialSiteConfig.rdf | 0 .../applicationMetadata/firsttime/propertygroups.rdf | 0 .../applicationMetadata/firsttime/propertygroups_labels_es.n3 | 0 {rdffiles => rdf}/display/everytime/aboutPage_es.n3 | 0 {rdffiles => rdf}/display/everytime/homePageDataGetters.n3 | 0 {rdffiles => rdf}/display/everytime/localeSelectionGUI.n3 | 0 {rdffiles => rdf}/display/everytime/menu_es.n3 | 0 {rdffiles => rdf}/display/everytime/vivoListViewConfig.rdf | 0 .../display/everytime/vivoOrganizationDataGetters.n3 | 0 {rdffiles => rdf}/display/everytime/vivoSearchProhibited.n3 | 0 {rdffiles => rdf}/display/firsttime/aboutPage.n3 | 0 {rdffiles => rdf}/display/firsttime/menu.n3 | 0 .../tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl | 0 {rdffiles => rdf}/tbox/filegraph/isDefinedBy-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/scires-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-bibo-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-c4o-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-core-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-dcelements-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-dcterms-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-event-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-fabio-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-foaf-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-pws-1.5.owl | 0 {rdffiles => rdf}/tbox/filegraph/vivo-skos-1.5.owl | 0 .../tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf | 0 .../tbox/firsttime/isDefinedBy-1.5-annotations.rdf | 0 {rdffiles => rdf}/tbox/firsttime/scires-1.5-annotations.rdf | 0 {rdffiles => rdf}/tbox/firsttime/vitro-0.7-annotations.rdf | 0 {rdffiles => rdf}/tbox/firsttime/vivo-core-1.5-annotations.rdf | 0 {rdffiles => rdf}/tbox/firsttime/vivo-core-1.5-labels_es.n3 | 0 43 files changed, 1 insertion(+), 1 deletion(-) rename {rdffiles => rdf}/abox/filegraph/academicDegree.rdf (100%) rename {rdffiles => rdf}/abox/filegraph/continents.n3 (100%) rename {rdffiles => rdf}/abox/filegraph/dateTimeValuePrecision.owl (100%) rename {rdffiles => rdf}/abox/filegraph/documentStatus.owl (100%) rename {rdffiles => rdf}/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl (100%) rename {rdffiles => rdf}/abox/filegraph/us-states.rdf (100%) rename {rdffiles => rdf}/abox/filegraph/vocabularySource.n3 (100%) rename {rdffiles => rdf}/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf (100%) rename {rdffiles => rdf}/abox/firsttime/vocabularySource-labels.n3 (100%) rename {rdffiles => rdf}/applicationMetadata/firsttime/classgroups.rdf (100%) rename {rdffiles => rdf}/applicationMetadata/firsttime/classgroups_labels_es.n3 (100%) rename {rdffiles => rdf}/applicationMetadata/firsttime/initialSiteConfig.rdf (100%) rename {rdffiles => rdf}/applicationMetadata/firsttime/propertygroups.rdf (100%) rename {rdffiles => rdf}/applicationMetadata/firsttime/propertygroups_labels_es.n3 (100%) rename {rdffiles => rdf}/display/everytime/aboutPage_es.n3 (100%) rename {rdffiles => rdf}/display/everytime/homePageDataGetters.n3 (100%) rename {rdffiles => rdf}/display/everytime/localeSelectionGUI.n3 (100%) rename {rdffiles => rdf}/display/everytime/menu_es.n3 (100%) rename {rdffiles => rdf}/display/everytime/vivoListViewConfig.rdf (100%) rename {rdffiles => rdf}/display/everytime/vivoOrganizationDataGetters.n3 (100%) rename {rdffiles => rdf}/display/everytime/vivoSearchProhibited.n3 (100%) rename {rdffiles => rdf}/display/firsttime/aboutPage.n3 (100%) rename {rdffiles => rdf}/display/firsttime/menu.n3 (100%) rename {rdffiles => rdf}/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/isDefinedBy-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/scires-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-bibo-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-c4o-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-core-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-dcelements-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-dcterms-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-event-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-fabio-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-foaf-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-pws-1.5.owl (100%) rename {rdffiles => rdf}/tbox/filegraph/vivo-skos-1.5.owl (100%) rename {rdffiles => rdf}/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf (100%) rename {rdffiles => rdf}/tbox/firsttime/isDefinedBy-1.5-annotations.rdf (100%) rename {rdffiles => rdf}/tbox/firsttime/scires-1.5-annotations.rdf (100%) rename {rdffiles => rdf}/tbox/firsttime/vitro-0.7-annotations.rdf (100%) rename {rdffiles => rdf}/tbox/firsttime/vivo-core-1.5-annotations.rdf (100%) rename {rdffiles => rdf}/tbox/firsttime/vivo-core-1.5-labels_es.n3 (100%) diff --git a/build.xml b/build.xml index ae687a97..2100f27f 100644 --- a/build.xml +++ b/build.xml @@ -69,7 +69,7 @@ - + diff --git a/rdffiles/abox/filegraph/academicDegree.rdf b/rdf/abox/filegraph/academicDegree.rdf similarity index 100% rename from rdffiles/abox/filegraph/academicDegree.rdf rename to rdf/abox/filegraph/academicDegree.rdf diff --git a/rdffiles/abox/filegraph/continents.n3 b/rdf/abox/filegraph/continents.n3 similarity index 100% rename from rdffiles/abox/filegraph/continents.n3 rename to rdf/abox/filegraph/continents.n3 diff --git a/rdffiles/abox/filegraph/dateTimeValuePrecision.owl b/rdf/abox/filegraph/dateTimeValuePrecision.owl similarity index 100% rename from rdffiles/abox/filegraph/dateTimeValuePrecision.owl rename to rdf/abox/filegraph/dateTimeValuePrecision.owl diff --git a/rdffiles/abox/filegraph/documentStatus.owl b/rdf/abox/filegraph/documentStatus.owl similarity index 100% rename from rdffiles/abox/filegraph/documentStatus.owl rename to rdf/abox/filegraph/documentStatus.owl diff --git a/rdffiles/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl b/rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl similarity index 100% rename from rdffiles/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl rename to rdf/abox/filegraph/geopolitical.abox.ver1.1-11-18-11.owl diff --git a/rdffiles/abox/filegraph/us-states.rdf b/rdf/abox/filegraph/us-states.rdf similarity index 100% rename from rdffiles/abox/filegraph/us-states.rdf rename to rdf/abox/filegraph/us-states.rdf diff --git a/rdffiles/abox/filegraph/vocabularySource.n3 b/rdf/abox/filegraph/vocabularySource.n3 similarity index 100% rename from rdffiles/abox/filegraph/vocabularySource.n3 rename to rdf/abox/filegraph/vocabularySource.n3 diff --git a/rdffiles/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf b/rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf similarity index 100% rename from rdffiles/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf rename to rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf diff --git a/rdffiles/abox/firsttime/vocabularySource-labels.n3 b/rdf/abox/firsttime/vocabularySource-labels.n3 similarity index 100% rename from rdffiles/abox/firsttime/vocabularySource-labels.n3 rename to rdf/abox/firsttime/vocabularySource-labels.n3 diff --git a/rdffiles/applicationMetadata/firsttime/classgroups.rdf b/rdf/applicationMetadata/firsttime/classgroups.rdf similarity index 100% rename from rdffiles/applicationMetadata/firsttime/classgroups.rdf rename to rdf/applicationMetadata/firsttime/classgroups.rdf diff --git a/rdffiles/applicationMetadata/firsttime/classgroups_labels_es.n3 b/rdf/applicationMetadata/firsttime/classgroups_labels_es.n3 similarity index 100% rename from rdffiles/applicationMetadata/firsttime/classgroups_labels_es.n3 rename to rdf/applicationMetadata/firsttime/classgroups_labels_es.n3 diff --git a/rdffiles/applicationMetadata/firsttime/initialSiteConfig.rdf b/rdf/applicationMetadata/firsttime/initialSiteConfig.rdf similarity index 100% rename from rdffiles/applicationMetadata/firsttime/initialSiteConfig.rdf rename to rdf/applicationMetadata/firsttime/initialSiteConfig.rdf diff --git a/rdffiles/applicationMetadata/firsttime/propertygroups.rdf b/rdf/applicationMetadata/firsttime/propertygroups.rdf similarity index 100% rename from rdffiles/applicationMetadata/firsttime/propertygroups.rdf rename to rdf/applicationMetadata/firsttime/propertygroups.rdf diff --git a/rdffiles/applicationMetadata/firsttime/propertygroups_labels_es.n3 b/rdf/applicationMetadata/firsttime/propertygroups_labels_es.n3 similarity index 100% rename from rdffiles/applicationMetadata/firsttime/propertygroups_labels_es.n3 rename to rdf/applicationMetadata/firsttime/propertygroups_labels_es.n3 diff --git a/rdffiles/display/everytime/aboutPage_es.n3 b/rdf/display/everytime/aboutPage_es.n3 similarity index 100% rename from rdffiles/display/everytime/aboutPage_es.n3 rename to rdf/display/everytime/aboutPage_es.n3 diff --git a/rdffiles/display/everytime/homePageDataGetters.n3 b/rdf/display/everytime/homePageDataGetters.n3 similarity index 100% rename from rdffiles/display/everytime/homePageDataGetters.n3 rename to rdf/display/everytime/homePageDataGetters.n3 diff --git a/rdffiles/display/everytime/localeSelectionGUI.n3 b/rdf/display/everytime/localeSelectionGUI.n3 similarity index 100% rename from rdffiles/display/everytime/localeSelectionGUI.n3 rename to rdf/display/everytime/localeSelectionGUI.n3 diff --git a/rdffiles/display/everytime/menu_es.n3 b/rdf/display/everytime/menu_es.n3 similarity index 100% rename from rdffiles/display/everytime/menu_es.n3 rename to rdf/display/everytime/menu_es.n3 diff --git a/rdffiles/display/everytime/vivoListViewConfig.rdf b/rdf/display/everytime/vivoListViewConfig.rdf similarity index 100% rename from rdffiles/display/everytime/vivoListViewConfig.rdf rename to rdf/display/everytime/vivoListViewConfig.rdf diff --git a/rdffiles/display/everytime/vivoOrganizationDataGetters.n3 b/rdf/display/everytime/vivoOrganizationDataGetters.n3 similarity index 100% rename from rdffiles/display/everytime/vivoOrganizationDataGetters.n3 rename to rdf/display/everytime/vivoOrganizationDataGetters.n3 diff --git a/rdffiles/display/everytime/vivoSearchProhibited.n3 b/rdf/display/everytime/vivoSearchProhibited.n3 similarity index 100% rename from rdffiles/display/everytime/vivoSearchProhibited.n3 rename to rdf/display/everytime/vivoSearchProhibited.n3 diff --git a/rdffiles/display/firsttime/aboutPage.n3 b/rdf/display/firsttime/aboutPage.n3 similarity index 100% rename from rdffiles/display/firsttime/aboutPage.n3 rename to rdf/display/firsttime/aboutPage.n3 diff --git a/rdffiles/display/firsttime/menu.n3 b/rdf/display/firsttime/menu.n3 similarity index 100% rename from rdffiles/display/firsttime/menu.n3 rename to rdf/display/firsttime/menu.n3 diff --git a/rdffiles/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl b/rdf/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl similarity index 100% rename from rdffiles/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl rename to rdf/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl diff --git a/rdffiles/tbox/filegraph/isDefinedBy-1.5.owl b/rdf/tbox/filegraph/isDefinedBy-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/isDefinedBy-1.5.owl rename to rdf/tbox/filegraph/isDefinedBy-1.5.owl diff --git a/rdffiles/tbox/filegraph/scires-1.5.owl b/rdf/tbox/filegraph/scires-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/scires-1.5.owl rename to rdf/tbox/filegraph/scires-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-bibo-1.5.owl b/rdf/tbox/filegraph/vivo-bibo-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-bibo-1.5.owl rename to rdf/tbox/filegraph/vivo-bibo-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-c4o-1.5.owl b/rdf/tbox/filegraph/vivo-c4o-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-c4o-1.5.owl rename to rdf/tbox/filegraph/vivo-c4o-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-core-1.5.owl b/rdf/tbox/filegraph/vivo-core-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-core-1.5.owl rename to rdf/tbox/filegraph/vivo-core-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-dcelements-1.5.owl b/rdf/tbox/filegraph/vivo-dcelements-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-dcelements-1.5.owl rename to rdf/tbox/filegraph/vivo-dcelements-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-dcterms-1.5.owl b/rdf/tbox/filegraph/vivo-dcterms-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-dcterms-1.5.owl rename to rdf/tbox/filegraph/vivo-dcterms-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-event-1.5.owl b/rdf/tbox/filegraph/vivo-event-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-event-1.5.owl rename to rdf/tbox/filegraph/vivo-event-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-fabio-1.5.owl b/rdf/tbox/filegraph/vivo-fabio-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-fabio-1.5.owl rename to rdf/tbox/filegraph/vivo-fabio-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-foaf-1.5.owl b/rdf/tbox/filegraph/vivo-foaf-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-foaf-1.5.owl rename to rdf/tbox/filegraph/vivo-foaf-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-pws-1.5.owl b/rdf/tbox/filegraph/vivo-pws-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-pws-1.5.owl rename to rdf/tbox/filegraph/vivo-pws-1.5.owl diff --git a/rdffiles/tbox/filegraph/vivo-skos-1.5.owl b/rdf/tbox/filegraph/vivo-skos-1.5.owl similarity index 100% rename from rdffiles/tbox/filegraph/vivo-skos-1.5.owl rename to rdf/tbox/filegraph/vivo-skos-1.5.owl diff --git a/rdffiles/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf b/rdf/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf similarity index 100% rename from rdffiles/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf rename to rdf/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf diff --git a/rdffiles/tbox/firsttime/isDefinedBy-1.5-annotations.rdf b/rdf/tbox/firsttime/isDefinedBy-1.5-annotations.rdf similarity index 100% rename from rdffiles/tbox/firsttime/isDefinedBy-1.5-annotations.rdf rename to rdf/tbox/firsttime/isDefinedBy-1.5-annotations.rdf diff --git a/rdffiles/tbox/firsttime/scires-1.5-annotations.rdf b/rdf/tbox/firsttime/scires-1.5-annotations.rdf similarity index 100% rename from rdffiles/tbox/firsttime/scires-1.5-annotations.rdf rename to rdf/tbox/firsttime/scires-1.5-annotations.rdf diff --git a/rdffiles/tbox/firsttime/vitro-0.7-annotations.rdf b/rdf/tbox/firsttime/vitro-0.7-annotations.rdf similarity index 100% rename from rdffiles/tbox/firsttime/vitro-0.7-annotations.rdf rename to rdf/tbox/firsttime/vitro-0.7-annotations.rdf diff --git a/rdffiles/tbox/firsttime/vivo-core-1.5-annotations.rdf b/rdf/tbox/firsttime/vivo-core-1.5-annotations.rdf similarity index 100% rename from rdffiles/tbox/firsttime/vivo-core-1.5-annotations.rdf rename to rdf/tbox/firsttime/vivo-core-1.5-annotations.rdf diff --git a/rdffiles/tbox/firsttime/vivo-core-1.5-labels_es.n3 b/rdf/tbox/firsttime/vivo-core-1.5-labels_es.n3 similarity index 100% rename from rdffiles/tbox/firsttime/vivo-core-1.5-labels_es.n3 rename to rdf/tbox/firsttime/vivo-core-1.5-labels_es.n3 From d084e9620d199c797174a61a43831d01ba2a49ca Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 21 Aug 2013 16:16:48 -0400 Subject: [PATCH 6/7] 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 7/7] 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