From 207f26081c0b884c9b42353ac9428735aab534f5 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 22 Jul 2011 20:52:00 +0000
Subject: [PATCH] merging from 1.3 branch

---
 .../ontologies/user/tbox/geopolitical-1.1-annotations.rdf     | 2 +-
 .../WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf    | 4 ++--
 .../ontologies/user/tbox/vivo-core-1.3-annotations.rdf        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf
index 38d23161..230292b0 100644
--- a/productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf
+++ b/productMods/WEB-INF/ontologies/user/tbox/geopolitical-1.1-annotations.rdf
@@ -506,7 +506,7 @@
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#geographical_region">
     <vitro:inClassGroup rdf:resource="http://vivoweb.org/ontology#vitroClassGrouplocations"/>
-    <rdfs:label xml:lang="en-US">geographical_region</rdfs:label>
+    <rdfs:label xml:lang="en-US">Transnational Region</rdfs:label>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
diff --git a/productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf
index 3851f799..3f9f1cdc 100644
--- a/productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf
+++ b/productMods/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf
@@ -4,8 +4,8 @@
     xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" > 
   <rdf:Description rdf:about="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#moniker">
-    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor,curator,dbAdmin"/>
-    <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor,curator,dbAdmin"/>
+    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor"/>
+    <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#editor"/>
     <rdfs:label xml:lang="en-US">moniker (deprecated)</rdfs:label>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">3</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">100</vitro:displayRankAnnot>
diff --git a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf b/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf
index 4202c474..42a604f0 100644
--- a/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf
+++ b/productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf
@@ -2581,7 +2581,6 @@
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>
-    <rdfs:label xml:lang="en-US">geographical_region</rdfs:label>
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#nationalityRU">
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody"/>
@@ -4135,6 +4134,7 @@
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayLimitAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#GeographicRegion">
+    <vitro:inClassGroup rdf:resource="http://vivoweb.org/ontology#vitroClassGrouplocations"/>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <rdfs:label xml:lang="en-US">Geographic Region</rdfs:label>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">-1</vitro:displayRankAnnot>