Merging Brian L's changes from rel-1.0-maint branch

2010-04-12 21:03:24 +00:00 · 2010-04-12 21:03:24 +00:00 · 60f93a2875
commit 60f93a2875
parent f3f1f1bc22
9 changed files with 23144 additions and 30 deletions
--- a/productMods/WEB-INF/ontologies/update/diff.tab.txt
+++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt
@ -61,7 +61,6 @@ http://vivoweb.org/ontology/core#degreeRecipient		No	Delete	not set
 http://vivoweb.org/ontology/core#altFirstName		No	Delete	not set
 http://vivoweb.org/ontology/core#hasNameVariant		No	Delete	not set
 http://vivoweb.org/ontology/core#CitationFormat		No	Delete	not set
-http://vivoweb.org/ontology/core#centerOrInstituteWithin		No	Delete	not set
 http://vivoweb.org/ontology/core#relatedActivityOrEvent		No	Delete	not set
 http://vivoweb.org/ontology/core#issueOf		No	Delete	not set
 http://vivoweb.org/ontology/core#nameVariantFor		No	Delete	not set
@ -81,6 +80,7 @@ http://vivoweb.org/ontology/core#degreeAbbrev		No	Delete	not set
 http://vivoweb.org/ontology/core#conferenceDate		No	Delete	not set
 http://vivoweb.org/ontology/core#publishedInTitle		No	Delete	not set
 http://vivoweb.org/ontology/core#hasLab	http://vivoweb.org/ontology/core#hasSubOrganization	Yes	Map	Use-instead
+http://vivoweb.org/ontology/core#centerOrInstituteWithin	http://vivoweb.org/ontology/core#subOrganizationWithin	Yes	Map	Use-instead
 http://vivoweb.org/ontology/core#collegeOrSchoolWithin	http://vivoweb.org/ontology/core#subOrganizationWithin	Yes	Map	Use-instead
 http://vivoweb.org/ontology/core#labWithin	http://vivoweb.org/ontology/core#subOrganizationWithin	Yes	Map	Use-instead
 http://vivoweb.org/ontology/core#countryOfStateOrProvince	http://vivoweb.org/ontology/core#geographicallyContains	Yes	Map	Use-instead
@ -134,4 +134,9 @@ http://vivoweb.org/ontology/core#researchActivities	http://vivoweb.org/ontology/
 http://www.w3.org/2004/02/skos/core#editorOf	http://vivoweb.org/ontology/core#editorOf	Yes	Map	Directly-changed
 http://vivoweb.org/ontology/core#hasOrganizationalAffiliate	http://vivoweb.org/ontology/core#affiliatedOrganization	Yes	Map	Use-instead
 http://vivoweb.org/ontology/core#organizationalAffiliateOf	http://vivoweb.org/ontology/core#affiliatedOrganization	Yes	Map	Use-instead
-http://vivoweb.org/ontology/core#conferenceDate	http://vivoweb.org/ontology/core#atTime	Yes	Map	Use-instead
+http://vivoweb.org/ontology/core#conferenceDate	http://vivoweb.org/ontology/core#atTime	Yes	Map	Use-instead
+http://vivoweb.org/ontology/core#description	http://vitro.mannlib.cornell.edu/ns/vitro/0.7#description	Yes	Map	Special mapping for VIVO 1.0 application (not a real ontology change)
+http://vivoweb.org/ontology/core#URLLink	http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Link	Yes	Map	Special mapping for VIVO 1.0 application (not a real ontology change)
+http://vivoweb.org/ontology/core#linkURI	http://vitro.mannlib.cornell.edu/ns/vitro/0.7#linkURL	Yes	Map	Special mapping for VIVO 1.0 application (not a real ontology change)
+http://vivoweb.org/ontology/core#linkAnchorText	http://vitro.mannlib.cornell.edu/ns/vitro/0.7#linkAnchor	Yes	Map	Special mapping for VIVO 1.0 application (not a real ontology change)
+http://vivoweb.org/ontology/core#webpage	http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink	Yes	Map	Special mapping for VIVO 1.0 application (not a real ontology change)
--- a/productMods/WEB-INF/ontologies/update/oldAnnotations/vivo-core-0.9-labels.rdf
+++ b/productMods/WEB-INF/ontologies/update/oldAnnotations/vivo-core-0.9-labels.rdf
--- a/productMods/WEB-INF/ontologies/update/oldVersion/geopolitical.owl.rdf
+++ b/productMods/WEB-INF/ontologies/update/oldVersion/geopolitical.owl.rdf
--- a/productMods/WEB-INF/ontologies/update/oldVersion/vitro-0.7.owl
+++ b/productMods/WEB-INF/ontologies/update/oldVersion/vitro-0.7.owl
@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE rdf [
+<!ENTITY vitro "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"> 
+<!ENTITY list "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"> ]>
+
+<rdf:RDF
+xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+xmlns:dc="http://purl.org/dc/elements/1.1/"
+xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+xmlns:owl="http://www.w3.org/2002/07/owl#"
+xmlns:vitro="&vitro;"
+>
+
+
+<!-- Vitro Application Ontology version 0.7 -->
+
+<!-- This ontology is used internally by the Vitro 0.7 Java application.  It is not user viewable or editable:  editing this file could have various unintended consequences --> 
+
+<owl:Ontology rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7">
+    <rdfs:label rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Vitro internals</rdfs:label>
+    <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">0.7</owl:versionInfo>
+</owl:Ontology>
+
+<!-- general Vitro constructs -->
+
+<owl:AnnotationProperty rdf:about="&vitro;descriptionAnnot"/>
+<owl:DatatypeProperty rdf:about="&vitro;displayLimit"/>
+<owl:AnnotationProperty rdf:about="&vitro;displayLimitAnnot"/>
+<owl:DatatypeProperty rdf:about="&vitro;displayRank"/>
+<owl:AnnotationProperty rdf:about="&vitro;displayRankAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;exampleAnnot"/>
+<owl:DatatypeProperty rdf:about="&vitro;hidden"/>
+<owl:AnnotationProperty rdf:about="&vitro;hiddenAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;modTimeAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;shortDefAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;oldId"/>
+
+<!-- VClassGroup-related constructs -->
+
+<owl:Class rdf:about="&vitro;ClassGroup"/>
+
+<!-- VClass-related constructs -->
+
+<owl:AnnotationProperty rdf:about="&vitro;harvestId"/>
+<owl:AnnotationProperty rdf:about="&vitro;inClassGroup"/>
+
+<!-- ObjectProperty-related constructs -->
+
+<owl:AnnotationProperty rdf:about="&vitro;fullPropertyNameAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;individualSortFieldAnnot"/>
+<owl:AnnotationProperty rdf:about="&vitro;individualSortDirectionAnnot"/>
+
+<!-- Tab-related constructs -->
+
+<!-- externalID-related constructs -->
+
+<owl:AnnotationProperty rdf:about="&vitro;isExternalId"/>
+<owl:AnnotationProperty rdf:about="&vitro;originalId"/>
+
+<!-- Keyword related -->
+
+<owl:Class rdf:about="&vitro;Keyword"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordStem"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordType"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordSource"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordComments"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordOrigin"/>
+<owl:Class rdf:about="&vitro;KeywordRelation"/>
+<owl:ObjectProperty rdf:about="&vitro;involvesIndividual"/>
+<owl:ObjectProperty rdf:about="&vitro;involvesKeyword"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordMode"/>
+
+<!-- Link related -->
+
+<owl:ObjectProperty rdf:about="&vitro;primaryLink"/>
+<owl:ObjectProperty rdf:about="&vitro;additionalLink"/>
+<owl:Class rdf:about="&vitro;Link"/>
+<owl:DatatypeProperty rdf:about="&vitro;linkAnchor"/>
+<owl:DatatypeProperty rdf:about="&vitro;linkURL"/>
+
+<!-- other Individual-related -->
+
+<owl:DatatypeProperty rdf:about="&vitro;curatorNote">
+     <rdfs:label xml:lang="en">curation note</rdfs:label>
+</owl:DatatypeProperty>
+<owl:DatatypeProperty rdf:about="&vitro;blurb"/>
+<owl:DatatypeProperty rdf:about="&vitro;citation"/>
+<owl:DatatypeProperty rdf:about="&vitro;description"/>
+<owl:DatatypeProperty rdf:about="&vitro;imageThumb"/>
+<owl:DatatypeProperty rdf:about="&vitro;imageFile"/>
+<owl:DatatypeProperty rdf:about="&vitro;modTime"/>
+<owl:DatatypeProperty rdf:about="&vitro;moniker"/>
+<owl:DatatypeProperty rdf:about="&vitro;sunrise"/>
+<owl:DatatypeProperty rdf:about="&vitro;sunset"/>
+<owl:DatatypeProperty rdf:about="&vitro;timekey"/>
+
+<!-- portal flag classes -->
+
+<owl:Class rdf:about="&vitro;Flag1Value0Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value1Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value2Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value3Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value4Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value5Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value6Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value7Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value8Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value9Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value10Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value11Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value12Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value13Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value14Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value15Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value16Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value17Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value18Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value19Thing"/>
+<owl:Class rdf:about="&vitro;Flag1Value20Thing"/>
+
+<!-- Portal-related constructs -->
+
+<owl:Class rdf:about="&vitro;Portal"/>
+<owl:ObjectProperty rdf:about="&vitro;rootTab"/>
+<owl:DatatypeProperty rdf:about="&vitro;themeDir"/>
+<owl:DatatypeProperty rdf:about="&vitro;bannerImage"/>
+<owl:DatatypeProperty rdf:about="&vitro;contactMail"/>
+<owl:DatatypeProperty rdf:about="&vitro;shortHand"/>
+<owl:DatatypeProperty rdf:about="&vitro;aboutText"/>
+<owl:DatatypeProperty rdf:about="&vitro;acknowledgeText"/>
+<owl:DatatypeProperty rdf:about="&vitro;bannerWidth"/>
+<owl:DatatypeProperty rdf:about="&vitro;bannerHeight"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2Numeric"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3Numeric"/>
+<owl:DatatypeProperty rdf:about="&vitro;copyrightURL"/>
+<owl:DatatypeProperty rdf:about="&vitro;copyrightAnchor"/>
+<owl:DatatypeProperty rdf:about="&vitro;rootBreadCrumbURL"/>
+<owl:DatatypeProperty rdf:about="&vitro;rootBreadCrumbAnchor"/>
+<owl:DatatypeProperty rdf:about="&vitro;logotypeImage"/>
+<owl:DatatypeProperty rdf:about="&vitro;logotypeHeight"/>
+<owl:DatatypeProperty rdf:about="&vitro;logotypeWidth"/>
+<owl:DatatypeProperty rdf:about="&vitro;imageThumbWidth"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag1SearchFiltering"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2SearchFiltering"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3SearchFiltering"/>
+<owl:DatatypeProperty rdf:about="&vitro;urlPrefix"/>
+
+<!-- Tab-related constructs -->
+
+<owl:Class rdf:about="&vitro;Tab"/>
+<owl:Class rdf:about="&vitro;SubcollectionCategory">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;Subcollection">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;Collection">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;SecondaryTab">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;PrimaryTabContent">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;PrimaryTab">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;AutoLinkableTab">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;ManuallyLinkableTab">
+    <rdfs:subClassOf rdf:resource="&vitro;Tab"/>
+</owl:Class>
+<owl:Class rdf:about="&vitro;MixedTab">
+    <rdfs:subClassOf rdf:resource="&vitro;AutoLinkableTab"/>
+    <rdfs:subClassOf rdf:resource="&vitro;ManuallyLinkableTab"/>
+</owl:Class>
+<owl:DatatypeProperty rdf:about="&vitro;tabCreatorUserId"/>
+<owl:DatatypeProperty rdf:about="&vitro;statusId"/>
+<owl:DatatypeProperty rdf:about="&vitro;tabBody"/>
+<owl:DatatypeProperty rdf:about="&vitro;dayLimit"/>
+<owl:DatatypeProperty rdf:about="&vitro;galleryRows"/>
+<owl:DatatypeProperty rdf:about="&vitro;galleryCols"/>
+<owl:DatatypeProperty rdf:about="&vitro;moreTag"/>
+<owl:DatatypeProperty rdf:about="&vitro;imageWidth"/>
+<owl:DatatypeProperty rdf:about="&vitro;individualSortDirection"/>
+<owl:DatatypeProperty rdf:about="&vitro;individualSortField"/>
+<owl:ObjectProperty rdf:about="&vitro;inPortal"/>
+<owl:DatatypeProperty rdf:about="&vitro;individualSortField"/>
+<owl:DatatypeProperty rdf:about="&vitro;individualSortDirection"/>
+<owl:DatatypeProperty rdf:about="&vitro;rssUrl"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2Set"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3Set"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2Mode"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3Mode"/>
+<owl:ObjectProperty rdf:about="&vitro;subTabOf"/>
+<owl:AnnotationProperty rdf:about="&vitro;autoLinkedToTab"/>
+<owl:Class rdf:about="&vitro;TabIndividualRelation"/>
+<owl:ObjectProperty rdf:about="&vitro;involvesIndividual"/>
+<owl:ObjectProperty rdf:about="&vitro;involvesTab"/>
+
+<!-- Application-related constructs -->
+
+<owl:Class rdf:about="&vitro;Application"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag1Name"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2Name"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3Name"/>
+<owl:DatatypeProperty rdf:about="&vitro;minSharedPortalId"/>
+<owl:DatatypeProperty rdf:about="&vitro;maxSharedPortalId"/>
+<owl:DatatypeProperty rdf:about="&vitro;rootLogotypeImage"/>
+<owl:DatatypeProperty rdf:about="&vitro;keywordHeading"/>
+<owl:DatatypeProperty rdf:about="&vitro;onlyCurrent"/>
+<owl:DatatypeProperty rdf:about="&vitro;maxPortalId"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag2Values"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag1Values"/>
+<owl:DatatypeProperty rdf:about="&vitro;flag3Values"/>
+
+<!-- User-related constructs -->
+
+<owl:Class rdf:about="&vitro;User"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#username"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#md5password"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#oldpassword"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#firstTime"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#loginCount"/>
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#roleURI"/>
+
+<!-- Namespace metadata -->
+<owl:DatatypeProperty rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#namespaceURI"/>
+<owl:Class rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Namespace"/>
+
+
+<!-- additions -->
+
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#hiddenFromDisplayBelowRoleLevelAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#flag1Filtering">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DatatypeProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#forceStubDeletionAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customShortViewAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#objectIndividualSortProperty">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#PropertyGroup">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#inPropertyGroupAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#shortDef">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#DependentResource">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#publicDescriptionAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#prohibitedFromUpdateBelowRoleLevelAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+  <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#AnnotationProperty"/>
+  </rdf:Description>
+
+</rdf:RDF>