updates for NIHVIVO-2682 and NIHVIVO-2683

productMods/WEB-INF/filegraph/abox/us-states.rdf

@@ -35,9 +35,9 @@
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
       <rdfs:label xml:lang="en">Delaware</rdfs:label>
    </rdf:Description>
-   <rdf:Description rdf:about="http://dbpedia.org/resource/Floria">
+   <rdf:Description rdf:about="http://dbpedia.org/resource/Florida">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>
-      <rdfs:label xml:lang="en">Floria</rdfs:label>
+      <rdfs:label xml:lang="en">Florida</rdfs:label>
    </rdf:Description>
    <rdf:Description rdf:about="http://dbpedia.org/resource/Georgia">
       <rdf:type rdf:resource="http://vivoweb.org/ontology/core#StateOrProvince"/>

productMods/WEB-INF/filegraph/tbox/scires-1.3.owl

@@ -49,11 +49,6 @@
     <owl:inverseOf rdf:resource="http://purl.obolibrary.org/obo/ERO_0000029"/>
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty"/>
   </rdf:Description>
-  <rdf:Description rdf:nodeID="A0">
-    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Restriction"/>
-    <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/ERO_0000460"/>
-    <owl:allValuesFrom rdf:resource="http://purl.org/ontology/bibo/Document"/>
-  </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/scientific-research">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Ontology"/>
   </rdf:Description>
@@ -117,6 +112,11 @@ NOTE that we are not addressing for now the issue of whether a foaf:Person is a
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
     <vitro:shortDef rdf:datatype="http://www.w3.org/2001/XMLSchema#string">An organism is a material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment.</vitro:shortDef>
   </rdf:Description>
+  <rdf:Description rdf:nodeID="A0">
+    <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Restriction"/>
+    <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/ERO_0000460"/>
+    <owl:allValuesFrom rdf:resource="http://purl.org/ontology/bibo/Document"/>
+  </rdf:Description>
   <rdf:Description rdf:about="http://purl.obolibrary.org/obo/ERO_0000016">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Class"/>
     <rdfs:subClassOf rdf:resource="http://purl.obolibrary.org/obo/ERO_0000015"/>

productMods/WEB-INF/ontologies/app/listViewConfig.owl

@@ -94,24 +94,28 @@
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasPresenterRole">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
     </rdf:Description>
-    
+        
-    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole">
-        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
-    </rdf:Description>
-    
-    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasReviewerRole">
-        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
-    </rdf:Description>
-    
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasOrganizerRole">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
     </rdf:Description>
+    
+    
+    <!-- The next two roles may not have a "role in" anything -->
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasEditReviewRole.xml</display:listViewConfigFile>
+    </rdf:Description>
+    
+    <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasReviewerRole">
+        <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasEditReviewRole.xml</display:listViewConfigFile>
+    </rdf:Description>
+    
+    
     <!--
      ******************************************************************
      end roles (from person) config
      ****************************************************************** 
     -->
-    
+        
     <rdf:Description rdf:about="http://vivoweb.org/ontology/core#relatedRole">
         <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile>
     </rdf:Description>

productMods/WEB-INF/ontologies/user/tbox/vivo-core-1.3-annotations.rdf

@@ -551,14 +551,15 @@
     <rdfs:label xml:lang="en-US">report identifier</rdfs:label>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole">
+    <vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">addEditorRoleToPerson.jsp</vitro:customEntryFormAnnot>
     <vitro:offerCreateNewOptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:offerCreateNewOptionAnnot>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</vitro:displayLimitAnnot>
+    <rdfs:label xml:lang="en-US">editor for</rdfs:label>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupoutreach"/>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">2</vitro:displayRankAnnot>
-    <rdfs:label xml:lang="en-US">editor of</rdfs:label>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#equipmentFor">
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupoverview"/>
@@ -3503,10 +3504,10 @@
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
   </rdf:Description>
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#advisingContributionTo">
-    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody"/>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupoverview"/>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">50</vitro:displayRankAnnot>
+    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
     <rdfs:label xml:lang="en-US">advising contribution to</rdfs:label>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</vitro:displayLimitAnnot>
@@ -4406,8 +4407,8 @@
   <rdf:Description rdf:about="http://vivoweb.org/ontology/core#NonFacultyAcademicPosition">
     <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>
-    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <rdfs:label xml:lang="en-US">Non-Faculty Academic Position</rdfs:label>
+    <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:extendedLinkedData rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:extendedLinkedData>
   </rdf:Description>
@@ -4560,6 +4561,7 @@
     <rdfs:label xml:lang="en-US">reviewer of</rdfs:label>
     <vitro:inPropertyGroupAnnot rdf:resource="http://vivoweb.org/ontology#vitroPropertyGroupoutreach"/>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
+    <vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">addReviewerRoleToPerson.jsp</vitro:customEntryFormAnnot>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">2</vitro:displayRankAnnot>
@@ -4873,6 +4875,7 @@
     <vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
     <vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
     <vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
+    <vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">addOrganizerRoleToPerson.jsp</vitro:customEntryFormAnnot>
     <vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">3</vitro:displayRankAnnot>
     <vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</vitro:displayLimitAnnot>
   </rdf:Description>

productMods/config/listViewConfig-hasEditReviewRole.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
+
+<!-- Discussion with Brian C: This file is a modification of listViewConfig-hasRole.xml -
+     it might be decided to merge the two. (sjm222 6/7/2011) -->
+
+<list-view-config>
+    <query-select>    
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX afn:  &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
+        
+        SELECT DISTINCT <collated>?subclass</collated>
+                        # send the property to the template, since this view supports multiple role properties
+                        ?property
+                        ?role 
+                        ?startDateOnly
+                        ?roleLabel 
+                        ?activity ?activityName 
+                        ?activityLabel
+                        ?infoResource ?infoResourceName
+                        ?infoResourceLabel
+                        ?dateTimeStart ?dateTimeEnd WHERE {
+                        
+            ?subject ?property ?role  
+            
+            OPTIONAL {  ?role core:roleIn ?activity 
+                        LET (?activityName := afn:localname(?activity)) 
+                        OPTIONAL { ?activity rdfs:label ?activityLabel }
+            } 
+            
+            OPTIONAL {  ?role core:forInformationResource ?infoResource 
+                        LET (?infoResourceName := afn:localname(?infoResource)) 
+                        OPTIONAL { ?infoResource rdfs:label ?infoResourceLabel }
+            }                     
+            <collated>
+            OPTIONAL { ?role a ?subclass .
+                       ?subclass rdfs:subClassOf core:Role 
+            }   
+            </collated>
+            OPTIONAL { ?role rdfs:label ?roleLabel }
+            OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval 
+                       OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
+                                  ?dateTimeStartValue core:dateTime ?dateTimeStart 
+                       }
+                       OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
+                                  ?dateTimeEndValue core:dateTime ?dateTimeEnd 
+                       }
+            }  
+            <critical-data-required>
+            FILTER ( bound(?infoResource) )
+            </critical-data-required>
+        } ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?infoResourceName
+    </query-select>
+    
+    <query-construct>
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;  
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;  
+        CONSTRUCT {
+            ?subclass rdfs:subClassOf core:Role 
+        } WHERE {
+            ?subclass rdfs:subClassOf core:Role 
+        }
+    </query-construct>
+    
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+        CONSTRUCT { 
+            ?subject ?property ?role .
+            ?role ?roleProperty ?roleValue . 
+            ?activity rdfs:label ?activityName 
+        } WHERE {
+            {
+               ?subject ?property ?role 
+            } UNION {
+               ?subject ?property ?role .
+               ?role ?roleProperty ?roleValue 
+            } UNION {
+               ?subject ?property ?role .
+               ?role core:roleIn ?activity . 
+               ?activity rdfs:label ?activityName 
+            }
+        } 
+    </query-construct>
+    
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
+        CONSTRUCT { 
+            ?subject ?property ?role .  
+            ?role core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:start ?dateTimeStartValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeStart 
+        } WHERE {
+            ?subject ?property ?role .  
+            ?role core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:start ?dateTimeStartValue .
+            ?dateTimeStartValue core:dateTime ?dateTimeStart 
+        } 
+    </query-construct>
+
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;   
+        CONSTRUCT { 
+            ?subject ?property ?role .  
+            ?role core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:end ?dateTimeEndValue .
+            ?dateTimeEndValue core:dateTime ?dateTimeEnd 
+        } WHERE {
+            ?subject ?property ?role .  
+            ?role core:dateTimeInterval ?dateTimeInterval .
+            ?dateTimeInterval core:end ?dateTimeEndValue .
+            ?dateTimeEndValue core:dateTime ?dateTimeEnd 
+        } 
+    </query-construct>
+    
+    <query-construct>
+        PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
+        PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;    
+        CONSTRUCT { 
+            ?subject ?property ?role .
+            ?role ?roleProperty ?roleValue . 
+            ?infoResource rdfs:label ?infoResourceLabel 
+        } WHERE {
+            {
+                ?subject ?property ?role 
+            } UNION {
+                ?subject ?property ?role .
+                ?role ?roleProperty ?roleValue .
+            } UNION {
+                ?subject ?property ?role .
+                ?role core:forInformationResource ?infoResource . 
+                ?infoResource rdfs:label ?infoResourceLabel .  
+            }
+        } 
+    </query-construct>
+
+    <template>propStatement-hasEditReviewRole.ftl</template>
+</list-view-config>

productMods/edit/forms/addClinicalRoleToPerson.jsp

@@ -3,6 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 

productMods/edit/forms/addEditorRoleToPerson.jsp

@@ -0,0 +1,11 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<jsp:include page="addRoleToPersonTwoStage.jsp">    
+	<jsp:param name="roleActivityTypeLabel" value="editor for" />
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#EditorRole" />	
+    <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
+	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
+	<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" /> 
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+</jsp:include>

productMods/edit/forms/addHeadOfRoleToPerson.jsp

@@ -3,7 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="head of" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
-	
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" />
 	 

productMods/edit/forms/addMemberRoleToPerson.jsp

@@ -2,7 +2,9 @@
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="membership" />
-	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />	
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" /> 
 	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />

productMods/edit/forms/addOrganizerRoleToPerson.jsp

@@ -0,0 +1,25 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<jsp:include page="addRoleToPersonTwoStage.jsp">    
+	<jsp:param name="roleActivityTypeLabel" value="organizer of" />
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />	
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
+	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
+	<jsp:param name="roleActivityType_literalOptions" 
+    value='["", "Select one"],
+           [ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
+           [ "http://vivoweb.org/ontology/core#Competition", "Competition" ],
+           [ "http://http://purl.org/ontology/bibo/Conference", "Conference" ],
+           [ "http://vivoweb.org/ontology/core#Course", "Course" ],
+           [ "http://vivoweb.org/ontology/core#Exhibit", "Exhibit" ],                     
+           [ "http://vivoweb.org/ontology/core#Meeting", "Meeting" ],
+           [ "http://http://purl.org/ontology/bibo/Presentation", "Presentation" ],
+           [ "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk" ],
+           [ "http://http://purl.org/ontology/bibo/Workshop", "Workshop" ],
+           [ "http://vivoweb.org/ontology/core#EventSeries", "Event Series" ],
+           [ "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series" ],
+           [ "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series" ],
+           [ "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series" ]' />       
+</jsp:include>

productMods/edit/forms/addOutreachRoleToPerson.jsp

@@ -3,7 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
-	
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />		
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 

productMods/edit/forms/addPresenterRoleToPerson.jsp

@@ -4,7 +4,9 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
 	<jsp:param name="buttonLabel" value="presentation role" />
-	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />			
 	<jsp:param name="numDateFields" value="1" />
 	<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />

productMods/edit/forms/addResearcherRoleToPerson.jsp

@@ -3,7 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="research activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
-	
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />		
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 

productMods/edit/forms/addReviewerRoleToPerson.jsp

@@ -0,0 +1,11 @@
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<jsp:include page="addRoleToPersonTwoStage.jsp">    
+	<jsp:param name="roleActivityTypeLabel" value="reviewer of" />
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ReviewerRole" />	
+    <jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />	
+	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
+	<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" /> 
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
+</jsp:include>

productMods/edit/forms/addRoleToPersonTwoStage.jsp

@@ -13,7 +13,7 @@
 
   ?person  core:hasResearchActivityRole ?newRole.
   ?newRole rdf:type core:ResearchActivityRole ;         
-           core:relatedRole ?someActivity .
+           roleToActivityPredicate ?someActivity .
   ?someActivity rdf:type core:ResearchActivity .
   ?someActivity rdfs:label "activity title" .
   
@@ -71,7 +71,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
    role type
    predicate inverse          
    role activity type label (should be singular)
-   super type of role types for roleActivityType select list generation 
+   super type of role types for roleActivityType select list generation
+   roleToActivityPredicate 
+   activityToRolePredicate
 --%>
 
 <c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
@@ -81,6 +83,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> 
 <c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
 <c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
+<c:set var="roleToActivityPredicate" scope="request">${param.roleToActivityPredicate}</c:set>
+<c:set var="activityToRolePredicate">${param.activityToRolePredicate}</c:set>
 
 <%
     VitroRequest vreq = new VitroRequest(request);
@@ -116,15 +120,17 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
   1.  Add, there is a subject and a predicate but no role and nothing else. 
         
   2. normal edit where everything should already be filled out.  There is a subject, a object and an individual on
-     the other end of the object's core:roleIn stmt. 
+     the other end of the object's roleToActivity stmt. 
   
-  3. Repair a bad role node.  There is a subject, prediate and object but there is no individual on the 
+  3. Repair a bad role node.  There is a subject, predicate and object but there is no individual on the 
-     other end of the object's core:roleIn stmt.  This should be similar to an add but the form should be expanded.
+     other end of the object's roleToActivity stmt.  This should be similar to an add but the form should be expanded.
      
-  4. Really bad node. multiple core:roleIn statements.
+  4. Really bad node. multiple roleToActivity statements.
 */
 
- EditMode mode = FrontEndEditingUtils.getEditMode(request, "http://vivoweb.org/ontology/core#roleIn");
+ String roleToActivityPredicate = (String) vreq.getAttribute("roleToActivityPredicate");
+ System.out.println("sjm: roleToActivityPredicate = " + roleToActivityPredicate);
+ EditMode mode = FrontEndEditingUtils.getEditMode(request, roleToActivityPredicate);
 
  if( mode == EditMode.ADD ) {
     %> <c:set var="editMode" value="add"/><%
@@ -166,8 +172,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
        
 	?person ?rolePredicate ?role.	
 	?role   a <${roleType}> .		  
-    ?role   core:roleIn ?roleActivity .    
+    ?role   <${roleToActivityPredicate}> ?roleActivity .    
-    ?roleActivity  core:relatedRole ?role .    
+    ?roleActivity  <${activityToRolePredicate}> ?role .    
 </v:jsonset>
 
 <v:jsonset var="n3ForActivityType">     
@@ -176,8 +182,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 
 <v:jsonset var="n3ForRoleToActivity"> 
 	@prefix core: <${vivoCore}> .    
-    ?role core:roleIn ?roleActivity .
+    ?role <${roleToActivityPredicate}> ?roleActivity .
-    ?roleActivity  core:relatedRole ?role .   
+    ?roleActivity <${activityToRolePredicate}> ?role .   
 </v:jsonset>
 
 <v:jsonset var="n3ForActivityLabel">
@@ -210,13 +216,13 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
   PREFIX core: <${vivoCore}>
   PREFIX rdfs: <${rdfs}> 
   SELECT ?existingTitle WHERE {
-        ?role  core:roleIn ?existingActivity .
+        ?role  <${roleToActivityPredicate}> ?existingActivity .
         ?existingActivity rdfs:label ?existingTitle . }
 </v:jsonset>
 
 <v:jsonset var="activityQuery">
   PREFIX core: <${vivoCore}>  
-  SELECT ?existingActivity WHERE { ?role  core:roleIn ?existingActivity . }
+  SELECT ?existingActivity WHERE { ?role  <${roleToActivityPredicate}> ?existingActivity . }
 </v:jsonset>
 
 <v:jsonset var="roleLabelQuery">
@@ -227,7 +233,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <v:jsonset var="activityTypeQuery">
         PREFIX core: <${vivoCore}>
         SELECT ?existingActivityType WHERE {
-            ?role core:roleIn ?existingActivity . 
+            ?role <${roleToActivityPredicate}> ?existingActivity . 
             ?existingActivity a ?existingActivityType . 
         }    
 </v:jsonset>
@@ -546,7 +552,7 @@ private static final String VIVO_CORE = "http://vivoweb.org/ontology/core#";
 private static final String  DEFAULT_ACTIVITY_TYPE_QUERY = 
     "PREFIX core: <" + VIVO_CORE + ">\n" +
     "SELECT ?existingActivityType WHERE { \n" +
-        "?role core:roleIn ?existingActivity . \n" +
+        "?role <${roleToActivityPredicate}> ?existingActivity . \n" +
         "?existingActivity a ?existingActivityType . \n" +
     "}"; 
 // The activity type query results must be limited to the values in the activity type select element. 
@@ -563,7 +569,7 @@ private String getActivityTypeQuery(VitroRequest vreq) {
 	    "PREFIX core: <" + VIVO_CORE + ">\n" +
 	    "PREFIX rdfs: <" + VitroVocabulary.RDFS + ">\n" +
 	    "SELECT ?existingActivityType WHERE {\n" +
-	        "?role core:roleIn ?existingActivity . \n" +
+	        "?role <${roleToActivityPredicate}> ?existingActivity . \n" +
 	        "?existingActivity a ?existingActivityType . \n" +
 	        "?existingActivityType rdfs:subClassOf <" + objectClassUri + "> . \n" +
 	    "}";

productMods/edit/forms/addServiceProviderRoleToPerson.jsp

@@ -3,6 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 	

productMods/edit/forms/addTeacherRoleToPerson.jsp

@@ -3,6 +3,8 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
+	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
+    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 

productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl

@@ -0,0 +1,34 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Custom object property statement view for core:hasEditorRole and core:hasReviewerRole.
+    
+     This template must be self-contained and not rely on other variables set for the individual page, because it
+     is also used to generate the property statement during a deletion.  
+ -->
+
+<#import "lib-sequence.ftl" as s>
+<#import "lib-datetime.ftl" as dt>
+
+<@showRole statement />
+
+<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
+     next statement -->
+<#macro showRole statement>
+    <#local linkedIndividual>
+        <#if statement.infoResource??>
+            <a href="${profileUrl(statement.infoResource)}">${statement.infoResourceLabel!statement.infoResourceName}</a>
+        <#elseif statement.activity??>
+            <a href="${profileUrl(statement.activity)}">${statement.activityLabel!statement.activityName}</a>
+        <#else>
+            <a href="${profileUrl(statement.role)}">${statement.roleLabel!}</a>
+        </#if>
+    </#local>
+    
+    <#local core = "http://vivoweb.org/ontology/core#">
+    <#local dateTime>
+        <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
+    </#local>
+
+    ${linkedIndividual} ${statement.roleLabel!} ${dateTime!}
+
+</#macro>