From 90ed7aa84512714c2c4f4262714ed23fc883e8aa Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 29 Mar 2010 18:58:53 +0000
Subject: [PATCH] resolves NIHVIVO-258 'get rid of position.rdf and
 activity.rdf'

---
 .../WEB-INF/ontologies/user/activity.rdf      | 18 ------------
 .../WEB-INF/ontologies/user/position.rdf      | 28 -------------------
 .../user/vivo-core-1.0-annotations.rdf        |  2 ++
 3 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 productMods/WEB-INF/ontologies/user/activity.rdf
 delete mode 100644 productMods/WEB-INF/ontologies/user/position.rdf

diff --git a/productMods/WEB-INF/ontologies/user/activity.rdf b/productMods/WEB-INF/ontologies/user/activity.rdf
deleted file mode 100644
index b2752bb9..00000000
--- a/productMods/WEB-INF/ontologies/user/activity.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<rdf:RDF
-    xmlns:core="http://vivoweb.org/ontology/core#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-    xmlns:owl="http://www.w3.org/2002/07/owl#" > 
-
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#ServiceActivity">
-    <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#ActivityDescription"/>
-    <j.0:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">serviceActivityShortView.jsp</j.0:customShortViewAnnot>
-  </rdf:Description>
-
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#professionalServiceActivity">
-    <j.0:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasServiceActivity.jsp</j.0:customEntryFormAnnot>
-  </rdf:Description>
-
-</rdf:RDF>
diff --git a/productMods/WEB-INF/ontologies/user/position.rdf b/productMods/WEB-INF/ontologies/user/position.rdf
deleted file mode 100644
index a8bd5f14..00000000
--- a/productMods/WEB-INF/ontologies/user/position.rdf
+++ /dev/null
@@ -1,28 +0,0 @@
-<rdf:RDF
-    xmlns:core="http://vivoweb.org/ontology/core#"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:j.0="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-    xmlns:owl="http://www.w3.org/2002/07/owl#" > 
-  
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#Position">
-    <rdfs:subClassOf rdf:resource="http://vivoweb.org/ontology/core#DependentResource"/>
-    <j.0:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">positionShortView.jsp</j.0:customShortViewAnnot>
-  </rdf:Description>
-  
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#personInPosition">
-    <j.0:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasPositionHistory.jsp</j.0:customEntryFormAnnot>
-  </rdf:Description>
-  
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#DependentResource">
-    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
-    <rdfs:label xml:lang="en-US">Dependent Resource</rdfs:label>
-    <rdfs:subClassOf rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#DependentResource"/>
-  </rdf:Description>
-
-  <rdf:Description rdf:about="http://vivoweb.org/ontology/core#organizationForPosition">
-    <j.0:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">organizationHasPositionHistory.jsp</j.0:customEntryFormAnnot>
-  </rdf:Description>
-
-</rdf:RDF>
diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.0-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.0-annotations.rdf
index a9078209..b0bf8541 100644
--- a/productMods/WEB-INF/ontologies/user/vivo-core-1.0-annotations.rdf
+++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.0-annotations.rdf
@@ -2237,6 +2237,7 @@
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
     >-1</vitro:displayRankAnnot>
+    <vitro:customShortViewAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">serviceActivityShortView.jsp</vitro:customShortViewAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#programOf">
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupadministration"/>
@@ -4634,6 +4635,7 @@
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupoutreach"/>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean"
     >true</vitro:selectFromExistingAnnot>
+    <vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasServiceActivity.jsp</vitro:customEntryFormAnnot>
   </rdf:Description>
   <rdf:Description rdf:about="http://aims.fao.org/aos/geopolitical.owl#validUntil">
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody"/>