Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
j2blake 2013-12-10 11:38:18 -05:00
commit 64f9ba8cf9
3 changed files with 103 additions and 31 deletions

View file

@ -664,6 +664,15 @@
<url-pattern>/admin/showAuth</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ShowConfiguration</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.admin.ShowConfiguration</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ShowConfiguration</servlet-name>
<url-pattern>/admin/showConfiguration</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>StartupStatus</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.admin.StartupStatusController</servlet-class>

View file

@ -97,7 +97,10 @@
<!-- http://aims.fao.org/aos/geopolitical.owl#isInGroup -->
<owl:ObjectProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#isInGroup"/>
<owl:ObjectProperty rdf:about="http://aims.fao.org/aos/geopolitical.owl#isInGroup">
<rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#group"/>
<rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#territory"/>
</owl:ObjectProperty>
@ -110,6 +113,8 @@
<geopolitical:sourceIdentifier xml:lang="en">http://unstats.un.org/unsd/methods/m49/m49chang.htm</geopolitical:sourceIdentifier>
<geopolitical:sourceIdentifier xml:lang="fr">http://unstats.un.org/unsd/methods/m49/m49chgef.htm</geopolitical:sourceIdentifier>
<owl:inverseOf rdf:resource="http://aims.fao.org/aos/geopolitical.owl#isSuccessorOf"/>
<rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
<rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
</owl:ObjectProperty>
@ -122,6 +127,8 @@
<terms:source rdf:datatype="http://www.w3.org/2001/XMLSchema#string">United Nations Statistics Division http://unstats.un.org/unsd/methods/m49/m49chang.htm</terms:source>
<geopolitical:sourceIdentifier xml:lang="en">http://unstats.un.org/unsd/methods/m49/m49chang.htm</geopolitical:sourceIdentifier>
<geopolitical:sourceIdentifier xml:lang="fr">http://unstats.un.org/unsd/methods/m49/m49chgef.htm</geopolitical:sourceIdentifier>
<rdfs:range rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
<rdfs:domain rdf:resource="http://aims.fao.org/aos/geopolitical.owl#area"/>
</owl:ObjectProperty>
@ -242,7 +249,7 @@
<!-- http://purl.obolibrary.org/obo/ERO_0000033 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/ERO_0000033">
<!-- TODO: create an inverse for VIVO -->
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Brian Druker has expertise in cancer research.</obo:IAO_0000112>
<obo:IAO_0000117 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000117>
<obo:IAO_0000119 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">PERSON: Melissa Haendel</obo:IAO_0000119>
@ -771,7 +778,7 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://purl.obolibrary.org/obo/OBI_0000304 -->
<owl:ObjectProperty rdf:about="http://purl.obolibrary.org/obo/OBI_0000304">
<!-- TODO: make an inverse property for VIVO -->
<obo:IAO_0000117 xml:lang="en">Alan Ruttenberg</obo:IAO_0000117>
<obo:IAO_0000117 xml:lang="en">Liju Fan</obo:IAO_0000117>
<obo:IAO_0000115 xml:lang="en">c is_manufactured_by o means that there was a process p in which c was built in which a person, or set of people or machines did the work(bore the &quot;Manufacturer Role&quot;, and those people/and or machines were members or of directed by the organization to do this.</obo:IAO_0000115>
@ -1202,11 +1209,12 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://purl.org/ontology/bibo/translationOf inverse of hasTranslation -->
<owl:ObjectProperty rdf:about="http://purl.org/ontology/bibo/translationOf">
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .</obo:IAO_0000112>
<rdfs:isDefinedBy rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">http://purl.org/ontology/bibo/</rdfs:isDefinedBy>
<rdfs:comment xml:lang="en">Relates a translated document to the original document.</rdfs:comment>
<ns:term_status>stable</ns:term_status>
<rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
<rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:ObjectProperty>
@ -1214,6 +1222,8 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://purl.org/ontology/bibo/translator -->
<owl:ObjectProperty rdf:about="http://purl.org/ontology/bibo/translator">
<rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
<rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
<owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#translatorOf"/>
</owl:ObjectProperty>
@ -1403,6 +1413,8 @@ there is a measurement process p that has specified output m, a measurement datu
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#hasTranslation">
<obo:IAO_0000112 rdf:datatype="http://www.w3.org/2001/XMLSchema#string">Examples shows a book has French language version. Public description source: http://bibotools.googlecode.com/svn/bibo-ontology/trunk/doc/index.html .</obo:IAO_0000112>
<owl:inverseOf rdf:resource="http://purl.org/ontology/bibo/translationOf"/>
<rdfs:domain rdf:resource="http://purl.org/ontology/bibo/Document"/>
<rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:ObjectProperty>
@ -1524,6 +1536,7 @@ there is a measurement process p that has specified output m, a measurement datu
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#translatorOf">
<rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
<rdfs:range rdf:resource="http://purl.org/ontology/bibo/Document"/>
</owl:ObjectProperty>
@ -1625,9 +1638,9 @@ there is a measurement process p that has specified output m, a measurement datu
<!-- http://www.w3.org/2004/02/skos/core#related -->
<owl:ObjectProperty rdf:about="http://www.w3.org/2004/02/skos/core#related">
<owl:SymmetricProperty rdf:about="http://www.w3.org/2004/02/skos/core#related">
</owl:ObjectProperty>
</owl:SymmetricProperty>

View file

@ -320,13 +320,13 @@ vivo:GovernmentAgency
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
skos:narrower
rdfs:label "narrower term"@en-US ;
rdfs:label "narrower concept"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"50"^^xsd:int ;
"52"^^xsd:int ;
vitro:fullPropertyNameAnnot
"narrower term"^^xsd:string ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -338,7 +338,9 @@ skos:narrower
vitro:publicDescriptionAnnot
"This relates a term that is narrower in meaning (i.e. more specific) to another term that is broader in meaning, where the scope (meaning) of narrower term falls completely within the scope of the broader term."^^xsd:string ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:affiliatedOrganization
rdfs:label "has affiliated organization"@en-US ;
@ -1224,6 +1226,8 @@ obo:IAO_0000007
vivo:expirationDate
rdfs:label "expiration date"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"1"^^xsd:int ;
vitro:displayRankAnnot
@ -2034,7 +2038,10 @@ vivo:courseCredits
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:publicDescriptionAnnot
"Number of credits assigned a course by an learning institution."^^xsd:string .
"Number of credits assigned a course by an learning institution."^^xsd:string ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vcard:note
rdfs:label "note"@en-US .
@ -2371,6 +2378,8 @@ vivo:grantSubcontractedThrough
vitro:publicDescriptionAnnot
"This relates a grant to the organization awarding the sub-contract for the grant."^^xsd:string ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
obo:ERO_0001260
@ -2960,12 +2969,16 @@ obo:ERO_0000395
geo:isSuccessorOf
rdfs:label "is successor of"@en-US ;
vitro:displayRankAnnot
"92"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
geo:agriculturalAreaUnit
rdfs:label "agricultural area unit"@en-US ;
@ -3022,12 +3035,20 @@ vivo:hasPrerequisite
rdfs:label "has prerequisite"@en-US ;
vitro:fullPropertyNameAnnot
"hasPrerequisite"^^xsd:string ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"40"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:Database
rdfs:label "Database"@en-US ;
@ -3270,12 +3291,16 @@ obo:RO_0002233
geo:isPredecessorOf
rdfs:label "is predecessor of"@en-US ;
vitro:displayRankAnnot
"94"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:EmeritusLibrarian
rdfs:label "Librarian Emeritus"@en-US ;
@ -3430,7 +3455,7 @@ bibo:translationOf
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"50"^^xsd:int ;
"52"^^xsd:int ;
vitro:fullPropertyNameAnnot
"translation of"^^xsd:string ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -3473,7 +3498,11 @@ geo:hasBorderWith
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:displayRankAnnot
"69"^^xsd:int ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
bibo:performer
rdfs:label "performer"@en-US ;
@ -3585,13 +3614,18 @@ geo:validUntil
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
geo:hasMember
rdfs:label "has member"@en-US ;
rdfs:label "has member country or territory"@en-US ;
vitro:displayRankAnnot
"65"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
bibo:eissn
rdfs:label "Electronic International Standard Serial Number (EISSN)"@en-US ;
@ -4212,13 +4246,18 @@ geo:validSince
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
geo:isInGroup
rdfs:label "is in group"@en-US ;
rdfs:label "in geographic grouping"@en-US ;
vitro:displayRankAnnot
"67"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:EditorialArticle
rdfs:label "Editorial Article"@en-US ;
@ -4952,7 +4991,7 @@ obo:ERO_0001245
"true"^^xsd:boolean .
skos:broader
rdfs:label "broader term"@en-US ;
rdfs:label "broader concept"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ;
vitro:displayLimitAnnot
@ -5085,6 +5124,8 @@ bibo:Interview
<http://purl.org/spar/c4o/hasGlobalCountDate>
rdfs:label "has global count date"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
@ -5285,13 +5326,13 @@ vivo:termLabel
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
skos:related
rdfs:label "related"@en-US ;
rdfs:label "related concept"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddConceptThroughObjectPropertyGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"60"^^xsd:int ;
"54"^^xsd:int ;
vitro:fullPropertyNameAnnot
"related"^^xsd:string ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -5303,7 +5344,9 @@ skos:related
vitro:publicDescriptionAnnot
"This indicates when a term is related to another term in the same vocabulary."^^xsd:string ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
obo:BFO_0000148
rdfs:label "Zero-Dimensional Temporal Region"@en-US .
@ -5846,7 +5889,7 @@ vivo:prerequisiteFor
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"40"^^xsd:int ;
"42"^^xsd:int ;
vitro:fullPropertyNameAnnot
"prerequisite for"^^xsd:string ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -5856,7 +5899,11 @@ vivo:prerequisiteFor
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
bibo:isbn13
rdfs:label "International Standard Book Number (ISBN) 13"@en-US ;
@ -5947,6 +5994,8 @@ vivo:translatorOf
vitro:publicDescriptionAnnot
"This relates something as the translator of an information resource."^^xsd:string ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
bibo:Document
@ -6156,7 +6205,7 @@ vivo:hasTranslation
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"50"^^xsd:int ;
"51"^^xsd:int ;
vitro:fullPropertyNameAnnot
"has translation"^^xsd:string ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
@ -6207,6 +6256,8 @@ geo:nameShortES
vivo:dateIssued
rdfs:label "date issued"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"1"^^xsd:int ;
vitro:displayRankAnnot
@ -7060,6 +7111,8 @@ vcard:hasSound
vivo:dateFiled
rdfs:label "date filed"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"1"^^xsd:int ;
vitro:displayRankAnnot
@ -7612,6 +7665,8 @@ vcard:OrganizationUnitName
vivo:dateTime
rdfs:label "date/time"@en-US , "date/time"@en-US ;
vitro:customEntryFormAnnot
"edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DateTimeValueFormGenerator"^^xsd:string ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
@ -7692,11 +7747,6 @@ geo:HDIYear
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
geo:isInGroup
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
geo:hasMaxLatitude
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .